5 files changed, 21 insertions, 13 deletions
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 764fd36..afb7baa 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -66,7 +66,8 @@ namespace {
 // messages and wait for the page to stop repainting.
 class PaintTimer : public RenderWidgetHost::PaintObserver {
  public:
-  PaintTimer() : method_factory_(this) {
+  PaintTimer()
+      : ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
     Start();
   }
 
diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 5b41058..e081bd9 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -155,12 +155,13 @@
 //
 //------------------------------------------------------------------------------
 
+#include "chrome/browser/metrics/metrics_service.h"
+
 #if defined(OS_WIN)
 #include <windows.h>
+#include <objbase.h>
 #endif
 
-#include "chrome/browser/metrics/metrics_service.h"
-
 #include "base/file_path.h"
 #include "base/histogram.h"
 #include "base/path_service.h"
@@ -374,8 +375,8 @@ MetricsService::MetricsService()
       current_log_(NULL),
       idle_since_last_transmission_(false),
       next_window_id_(0),
-      log_sender_factory_(this),
-      state_saver_factory_(this),
+      ALLOW_THIS_IN_INITIALIZER_LIST(log_sender_factory_(this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(state_saver_factory_(this)),
       logged_samples_(),
       interlog_duration_(TimeDelta::FromSeconds(kInitialInterlogDuration)),
       log_event_limit_(kInitialEventLimit),
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.cc b/chrome/browser/renderer_host/resource_dispatcher_host.cc
index d746201..ba161e4 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.cc
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.cc
@@ -133,15 +133,18 @@ bool ShouldServiceRequest(int render_process_host_id,
 ResourceDispatcherHost::ResourceDispatcherHost(MessageLoop* io_loop)
     : ui_loop_(MessageLoop::current()),
       io_loop_(io_loop),
-      download_file_manager_(new DownloadFileManager(ui_loop_, this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          download_file_manager_(new DownloadFileManager(ui_loop_, this))),
       download_request_manager_(new DownloadRequestManager(io_loop, ui_loop_)),
-      save_file_manager_(new SaveFileManager(ui_loop_, io_loop, this)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          save_file_manager_(new SaveFileManager(ui_loop_, io_loop, this))),
       safe_browsing_(new SafeBrowsingService),
       request_id_(-1),
       plugin_service_(PluginService::GetInstance()),
-      method_runner_(this),
+      ALLOW_THIS_IN_INITIALIZER_LIST(method_runner_(this)),
       is_shutdown_(false),
-      max_outstanding_requests_cost_per_process_(kMaxOutstandingRequestsCostPerProcess) {
+      max_outstanding_requests_cost_per_process_(
+          kMaxOutstandingRequestsCostPerProcess) {
 }
 
 ResourceDispatcherHost::~ResourceDispatcherHost() {
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index e8ae41f..af6c73c 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -45,7 +45,7 @@ void NotifyPrunedEntries(NavigationController* nav_controller,
 
 // Ensure the given NavigationEntry has a valid state, so that WebKit does not
 // get confused if we navigate back to it.
-// 
+//
 // An empty state is treated as a new navigation by WebKit, which would mean
 // losing the navigation entries and generating a new navigation entry after
 // this one. We don't want that. To avoid this we create a valid state which
@@ -157,7 +157,7 @@ NavigationController::NavigationController(TabContents* contents,
       transient_entry_index_(-1),
       active_contents_(contents),
       max_restored_page_id_(-1),
-      ssl_manager_(this, NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this, NULL)),
       needs_reload_(false),
       load_pending_entry_when_active_(false) {
   if (contents)
@@ -176,7 +176,7 @@ NavigationController::NavigationController(
       transient_entry_index_(-1),
       active_contents_(NULL),
       max_restored_page_id_(-1),
-      ssl_manager_(this, NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(ssl_manager_(this, NULL)),
       needs_reload_(true),
       load_pending_entry_when_active_(false) {
   DCHECK(profile_);
@@ -770,7 +770,7 @@ void NavigationController::RendererDidNavigateToExistingPage(
   // actually change any other state, just kill the pointer.
   if (entry == pending_entry_)
     DiscardNonCommittedEntriesInternal();
-  
+
   last_committed_entry_index_ = entry_index;
 }
 
diff --git a/chrome/browser/window_sizer.cc b/chrome/browser/window_sizer.cc
index 450fae4..d03e8b1 100644
--- a/chrome/browser/window_sizer.cc
+++ b/chrome/browser/window_sizer.cc
@@ -4,6 +4,9 @@
 
 #include "chrome/browser/window_sizer.h"
 
+#include <atlbase.h>
+#include <atltypes.h>
+
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"