FBTF: Remove unneeded headers from base/ (part 10)

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/5139006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67662 0039d316-1c4b-4281-b951-d872f2087c98

45 files changed, 65 insertions, 85 deletions

diff --git a/chrome/browser/autocomplete/autocomplete.h b/chrome/browser/autocomplete/autocomplete.h
index dbf5c0e..5be81a91 100644
--- a/chrome/browser/autocomplete/autocomplete.h
+++ b/chrome/browser/autocomplete/autocomplete.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "base/logging.h"
+#include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/timer.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/autocomplete_history_manager_unittest.cc b/chrome/browser/autocomplete_history_manager_unittest.cc
index 409225f2..6659ba6 100644
--- a/chrome/browser/autocomplete_history_manager_unittest.cc
+++ b/chrome/browser/autocomplete_history_manager_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "base/ref_counted.h"
 #include "base/string16.h"
-#include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete_history_manager.h"
 #include "chrome/browser/webdata/web_data_service.h"
diff --git a/chrome/browser/automation/automation_resource_message_filter.h b/chrome/browser/automation/automation_resource_message_filter.h
index 82081ec..d9ff401 100644
--- a/chrome/browser/automation/automation_resource_message_filter.h
+++ b/chrome/browser/automation/automation_resource_message_filter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -7,10 +7,11 @@
 #pragma once
 
 #include <map>
+#include <string>
+#include <vector>
 
 #include "base/atomicops.h"
 #include "base/lazy_instance.h"
-#include "base/lock.h"
 #include "base/platform_thread.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "net/base/completion_callback.h"
@@ -218,4 +219,3 @@ class AutomationResourceMessageFilter
 };
 
 #endif  // CHROME_BROWSER_AUTOMATION_AUTOMATION_RESOURCE_MESSAGE_FILTER_H_
-
diff --git a/chrome/browser/browsing_data_appcache_helper.h b/chrome/browser/browsing_data_appcache_helper.h
index b54b511..a5cd2a3a 100644
--- a/chrome/browser/browsing_data_appcache_helper.h
+++ b/chrome/browser/browsing_data_appcache_helper.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "chrome/browser/appcache/chrome_appcache_service.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/chromeos/external_metrics.h b/chrome/browser/chromeos/external_metrics.h
index eac8c64..40f243e 100644
--- a/chrome/browser/chromeos/external_metrics.h
+++ b/chrome/browser/chromeos/external_metrics.h
@@ -6,12 +6,14 @@
 #define CHROME_BROWSER_CHROMEOS_EXTERNAL_METRICS_H_
 #pragma once
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
-#include "base/task.h"
+#include "base/ref_counted.h"
 
 namespace chromeos {
 
diff --git a/chrome/browser/cocoa/constrained_window_mac.h b/chrome/browser/cocoa/constrained_window_mac.h
index 321f9c7b..42d27e7 100644
--- a/chrome/browser/cocoa/constrained_window_mac.h
+++ b/chrome/browser/cocoa/constrained_window_mac.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -11,7 +11,6 @@
 #include "chrome/browser/tab_contents/constrained_window.h"
 
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/scoped_nsobject.h"
 
 @class BrowserWindowController;
@@ -95,15 +94,7 @@ class ConstrainedWindowMacDelegateCustomSheet
 
  protected:
   // For when you need to delay initalization after the constructor call.
-  void init(NSWindow* sheet, id delegate, SEL didEndSelector) {
-    DCHECK(!delegate_.get());
-    DCHECK(!didEndSelector_);
-    customSheet_.reset([sheet retain]);
-    delegate_.reset([delegate retain]);
-    didEndSelector_ = didEndSelector;
-    DCHECK(delegate_.get());
-    DCHECK(didEndSelector_);
-  }
+  void init(NSWindow* sheet, id delegate, SEL didEndSelector);
   void set_sheet(NSWindow* sheet) { customSheet_.reset([sheet retain]); }
   NSWindow* sheet() { return customSheet_; }
 
@@ -162,4 +153,3 @@ class ConstrainedWindowMac : public ConstrainedWindow {
 };
 
 #endif  // CHROME_BROWSER_COCOA_CONSTRAINED_WINDOW_MAC_H_
-
diff --git a/chrome/browser/cocoa/constrained_window_mac.mm b/chrome/browser/cocoa/constrained_window_mac.mm
index e063896..e780ab7 100644
--- a/chrome/browser/cocoa/constrained_window_mac.mm
+++ b/chrome/browser/cocoa/constrained_window_mac.mm
@@ -1,9 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/cocoa/constrained_window_mac.h"
 
+#include "base/logging.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
@@ -41,6 +42,17 @@ void ConstrainedWindowMacDelegateCustomSheet::RunSheet(
                   contextInfo:NULL];
 }
 
+void ConstrainedWindowMacDelegateCustomSheet::init(NSWindow* sheet,
+    id delegate, SEL didEndSelector) {
+  DCHECK(!delegate_.get());
+  DCHECK(!didEndSelector_);
+  customSheet_.reset([sheet retain]);
+  delegate_.reset([delegate retain]);
+  didEndSelector_ = didEndSelector;
+  DCHECK(delegate_.get());
+  DCHECK(didEndSelector_);
+}
+
 // static
 ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog(
     TabContents* parent,
diff --git a/chrome/browser/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/cocoa/extensions/extension_action_context_menu.mm
index 36ff520..162137c 100644
--- a/chrome/browser/cocoa/extensions/extension_action_context_menu.mm
+++ b/chrome/browser/cocoa/extensions/extension_action_context_menu.mm
@@ -6,7 +6,6 @@
 
 #include "app/l10n_util_mac.h"
 #include "base/sys_string_conversions.h"
-#include "base/task.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/cocoa/browser_window_controller.h"
diff --git a/chrome/browser/device_orientation/provider_unittest.cc b/chrome/browser/device_orientation/provider_unittest.cc
index a84de5bc..766210c 100644
--- a/chrome/browser/device_orientation/provider_unittest.cc
+++ b/chrome/browser/device_orientation/provider_unittest.cc
@@ -6,7 +6,6 @@
 
 #include "base/lock.h"
 #include "base/message_loop.h"
-#include "base/task.h"
 #include "chrome/browser/device_orientation/data_fetcher.h"
 #include "chrome/browser/device_orientation/orientation.h"
 #include "chrome/browser/device_orientation/provider.h"
@@ -311,7 +310,7 @@ TEST_F(DeviceOrientationProviderTest, StartStopStart) {
   provider_->AddObserver(checker_a.get());
   MessageLoop::current()->Run();
 
-  provider_->RemoveObserver(checker_a.get()); // This stops the Provider.
+  provider_->RemoveObserver(checker_a.get());  // This stops the Provider.
 
   checker_b->AddExpectation(kTestOrientation2);
   orientation_factory->SetOrientation(kTestOrientation2);
diff --git a/chrome/browser/dock_info_gtk.cc b/chrome/browser/dock_info_gtk.cc
index 3b29395..80262c2 100644
--- a/chrome/browser/dock_info_gtk.cc
+++ b/chrome/browser/dock_info_gtk.cc
@@ -7,7 +7,6 @@
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
-#include "base/task.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/gtk/browser_window_gtk.h"
diff --git a/chrome/browser/dom_ui/file_browse_browsertest.cc b/chrome/browser/dom_ui/file_browse_browsertest.cc
index c8d7a1f..e2e4e00 100644
--- a/chrome/browser/dom_ui/file_browse_browsertest.cc
+++ b/chrome/browser/dom_ui/file_browse_browsertest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/task.h"
 #include "base/path_service.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ -21,9 +20,9 @@ typedef DOMElementProxy::By By;
 
 class FileBrowseBrowserTest : public InProcessBrowserTest {
  public:
-   FileBrowseBrowserTest() {
-     EnableDOMAutomation();
-   }
+  FileBrowseBrowserTest() {
+    EnableDOMAutomation();
+  }
 };
 
 class FileBrowseUiObserver : public NotificationObserver {
diff --git a/chrome/browser/extensions/extension_devtools_manager.cc b/chrome/browser/extensions/extension_devtools_manager.cc
index 20f4eb0..324ca69 100644
--- a/chrome/browser/extensions/extension_devtools_manager.cc
+++ b/chrome/browser/extensions/extension_devtools_manager.cc
@@ -6,7 +6,6 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "base/task.h"
 #include "chrome/browser/extensions/extension_devtools_bridge.h"
 #include "chrome/browser/extensions/extension_devtools_events.h"
 
@@ -69,4 +68,3 @@ void ExtensionDevToolsManager::BridgeClosingForTab(int tab_id) {
   }
   tab_id_to_render_process_ids_.erase(tab_id);
 }
-
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index 041dba0..20f8d3c 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -16,7 +16,6 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_temp_dir.h"
-#include "base/task.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chrome/browser/extensions/extensions_service.h"
diff --git a/chrome/browser/favicon_service.h b/chrome/browser/favicon_service.h
index b6ef85b..1c98c30 100644
--- a/chrome/browser/favicon_service.h
+++ b/chrome/browser/favicon_service.h
@@ -10,7 +10,6 @@
 
 #include "base/ref_counted.h"
 #include "base/ref_counted_memory.h"
-#include "base/task.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/common/notification_observer.h"
diff --git a/chrome/browser/gtk/tabs/dragged_tab_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
index 6d7fcc4..c4436d1 100644
--- a/chrome/browser/gtk/tabs/dragged_tab_gtk.h
+++ b/chrome/browser/gtk/tabs/dragged_tab_gtk.h
@@ -12,7 +12,6 @@
 #include "app/slide_animation.h"
 #include "base/callback.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "gfx/canvas.h"
 #include "gfx/point.h"
 #include "gfx/rect.h"
diff --git a/chrome/browser/in_process_webkit/webkit_thread.h b/chrome/browser/in_process_webkit/webkit_thread.h
index 76e9730..e616a02 100644
--- a/chrome/browser/in_process_webkit/webkit_thread.h
+++ b/chrome/browser/in_process_webkit/webkit_thread.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/lock.h"
 #include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_thread.h"
diff --git a/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc b/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc
index 1e7d4b3..39fed42 100644
--- a/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc
+++ b/chrome/browser/renderer_host/redirect_to_file_resource_handler.cc
@@ -4,11 +4,12 @@
 
 #include "chrome/browser/renderer_host/redirect_to_file_resource_handler.h"
 
+#include <string>
+
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
 #include "base/platform_file.h"
-#include "base/task.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/common/resource_response.h"
 #include "net/base/file_stream.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_store.cc b/chrome/browser/safe_browsing/safe_browsing_store.cc
index ea5d4f5..ae913791 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_store.cc
@@ -6,6 +6,8 @@
 
 #include <algorithm>
 
+#include "base/task.h"
+
 namespace {
 
 // Find items matching between |subs| and |adds|, and remove them,
@@ -134,19 +136,19 @@ void SBProcessSubs(std::vector<SBAddPrefix>* add_prefixes,
 
   // Sort the inputs by the SBAddPrefix bits.
   std::sort(add_prefixes->begin(), add_prefixes->end(),
-            SBAddPrefixLess<SBAddPrefix,SBAddPrefix>);
+            SBAddPrefixLess<SBAddPrefix, SBAddPrefix>);
   std::sort(sub_prefixes->begin(), sub_prefixes->end(),
-            SBAddPrefixLess<SBSubPrefix,SBSubPrefix>);
+            SBAddPrefixLess<SBSubPrefix, SBSubPrefix>);
   std::sort(add_full_hashes->begin(), add_full_hashes->end(),
-            SBAddPrefixHashLess<SBAddFullHash,SBAddFullHash>);
+            SBAddPrefixHashLess<SBAddFullHash, SBAddFullHash>);
   std::sort(sub_full_hashes->begin(), sub_full_hashes->end(),
-            SBAddPrefixHashLess<SBSubFullHash,SBSubFullHash>);
+            SBAddPrefixHashLess<SBSubFullHash, SBSubFullHash>);
 
   // Factor out the prefix subs.
   std::vector<SBAddPrefix> removed_adds;
   KnockoutSubs(sub_prefixes, add_prefixes,
-               SBAddPrefixLess<SBAddPrefix,SBSubPrefix>,
-               SBAddPrefixLess<SBSubPrefix,SBAddPrefix>,
+               SBAddPrefixLess<SBAddPrefix, SBSubPrefix>,
+               SBAddPrefixLess<SBSubPrefix, SBAddPrefix>,
                &removed_adds);
 
   // Remove the full-hashes corrosponding to the adds which
@@ -167,8 +169,8 @@ void SBProcessSubs(std::vector<SBAddPrefix>* add_prefixes,
     // Factor out the full-hash subs.
     std::vector<SBAddFullHash> removed_full_adds;
     KnockoutSubs(sub_full_hashes, add_full_hashes,
-                 SBAddPrefixHashLess<SBAddFullHash,SBSubFullHash>,
-                 SBAddPrefixHashLess<SBSubFullHash,SBAddFullHash>,
+                 SBAddPrefixHashLess<SBAddFullHash, SBSubFullHash>,
+                 SBAddPrefixHashLess<SBSubFullHash, SBAddFullHash>,
                  &removed_full_adds);
   }
 
diff --git a/chrome/browser/safe_browsing/safe_browsing_store.h b/chrome/browser/safe_browsing/safe_browsing_store.h
index 418c55f..e7d928d 100644
--- a/chrome/browser/safe_browsing/safe_browsing_store.h
+++ b/chrome/browser/safe_browsing/safe_browsing_store.h
@@ -11,7 +11,6 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/hash_tables.h"
-#include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/safe_browsing/safe_browsing_util.h"
 
diff --git a/chrome/browser/search_engines/search_host_to_urls_map.cc b/chrome/browser/search_engines/search_host_to_urls_map.cc
index cc01aae..0bc8905e 100644
--- a/chrome/browser/search_engines/search_host_to_urls_map.cc
+++ b/chrome/browser/search_engines/search_host_to_urls_map.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 
diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h
index ff22eb3..de51cfd 100644
--- a/chrome/browser/service/service_process_control.h
+++ b/chrome/browser/service/service_process_control.h
@@ -13,12 +13,12 @@
 #include "base/callback.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "ipc/ipc_sync_channel.h"
 
 class Profile;
+class Task;
 
 // A ServiceProcessControl works as a portal between the service process and
 // the browser process.
diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc
index 0a88c5d..4c9c7c9 100644
--- a/chrome/browser/shell_integration_linux.cc
+++ b/chrome/browser/shell_integration_linux.cc
@@ -26,7 +26,6 @@
 #include "base/string_number_conversions.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
-#include "base/task.h"
 #include "base/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/speech/endpointer/endpointer_unittest.cc b/chrome/browser/speech/endpointer/endpointer_unittest.cc
index bbdc572..2348725 100644
--- a/chrome/browser/speech/endpointer/endpointer_unittest.cc
+++ b/chrome/browser/speech/endpointer/endpointer_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/task.h"
 #include "chrome/browser/speech/endpointer/endpointer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc
index 6409e9b..48df832 100644
--- a/chrome/browser/sync/glue/autofill_model_associator.cc
+++ b/chrome/browser/sync/glue/autofill_model_associator.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "base/task.h"
 #include "base/time.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
index 78541b0..41110e2 100644
--- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/sync/glue/data_type_manager.h b/chrome/browser/sync/glue/data_type_manager.h
index 24049f2..440d494 100644
--- a/chrome/browser/sync/glue/data_type_manager.h
+++ b/chrome/browser/sync/glue/data_type_manager.h
@@ -8,7 +8,6 @@
 
 #include <set>
 
-#include "base/task.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 
diff --git a/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc b/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc
index a85bfc5..6f2803d 100644
--- a/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/extension_data_type_controller_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/sync/glue/extension_data_type_controller.h"
 #include "chrome/browser/sync/glue/change_processor_mock.h"
diff --git a/chrome/browser/sync/glue/history_model_worker.cc b/chrome/browser/sync/glue/history_model_worker.cc
index 1c39501..304772a 100644
--- a/chrome/browser/sync/glue/history_model_worker.cc
+++ b/chrome/browser/sync/glue/history_model_worker.cc
@@ -6,7 +6,6 @@
 
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "base/task.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/history/history.h"
diff --git a/chrome/browser/sync/glue/password_model_associator.h b/chrome/browser/sync/glue/password_model_associator.h
index 22c81ba..1c40982 100644
--- a/chrome/browser/sync/glue/password_model_associator.h
+++ b/chrome/browser/sync/glue/password_model_associator.h
@@ -12,7 +12,6 @@
 
 #include "base/basictypes.h"
 #include "base/lock.h"
-#include "base/task.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sync/glue/model_associator.h"
diff --git a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
index 19d12b6..7cee1d5e 100644
--- a/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/preference_data_type_controller_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/sync/glue/preference_data_type_controller.h"
diff --git a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
index 2f4e5b2..b523b54 100644
--- a/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
+++ b/chrome/browser/sync/glue/theme_data_type_controller_unittest.cc
@@ -7,7 +7,6 @@
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/sync/glue/theme_data_type_controller.h"
 #include "chrome/browser/sync/glue/change_processor_mock.h"
diff --git a/chrome/browser/sync/glue/typed_url_model_associator.h b/chrome/browser/sync/glue/typed_url_model_associator.h
index a07bae9..d379f57 100644
--- a/chrome/browser/sync/glue/typed_url_model_associator.h
+++ b/chrome/browser/sync/glue/typed_url_model_associator.h
@@ -12,7 +12,6 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
-#include "base/task.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/sync/glue/model_associator.h"
diff --git a/chrome/browser/sync/profile_sync_factory.h b/chrome/browser/sync/profile_sync_factory.h
index a4a2550..c1cae14 100644
--- a/chrome/browser/sync/profile_sync_factory.h
+++ b/chrome/browser/sync/profile_sync_factory.h
@@ -9,7 +9,6 @@
 #include <string>
 #include <utility>
 
-#include "base/task.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/model_associator.h"
diff --git a/chrome/browser/tab_contents/render_view_host_manager.cc b/chrome/browser/tab_contents/render_view_host_manager.cc
index c9e6373..b88f6d3 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.cc
+++ b/chrome/browser/tab_contents/render_view_host_manager.cc
@@ -217,6 +217,17 @@ void RenderViewHostManager::RendererAbortedProvisionalLoad(
   // the response is not a download.
 }
 
+void RenderViewHostManager::set_interstitial_page(
+    InterstitialPage* interstitial_page) {
+  DCHECK(!interstitial_page_ && interstitial_page);
+  interstitial_page_ = interstitial_page;
+}
+
+void RenderViewHostManager::remove_interstitial_page() {
+  DCHECK(interstitial_page_);
+  interstitial_page_ = NULL;
+}
+
 void RenderViewHostManager::ShouldClosePage(bool for_cross_site_transition,
                                             bool proceed) {
   if (for_cross_site_transition) {
diff --git a/chrome/browser/tab_contents/render_view_host_manager.h b/chrome/browser/tab_contents/render_view_host_manager.h
index 01a8f0d..622a381 100644
--- a/chrome/browser/tab_contents/render_view_host_manager.h
+++ b/chrome/browser/tab_contents/render_view_host_manager.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/common/notification_registrar.h"
@@ -146,16 +145,10 @@ class RenderViewHostManager
   // |interstitial_page| should be non NULL (use the remove_interstitial_page
   // method to unset the interstitial) and no interstitial page should be set
   // when there is already a non NULL interstitial page set.
-  void set_interstitial_page(InterstitialPage* interstitial_page) {
-    DCHECK(!interstitial_page_ && interstitial_page);
-    interstitial_page_ = interstitial_page;
-  }
+  void set_interstitial_page(InterstitialPage* interstitial_page);
 
   // Unsets the currently showing interstitial.
-  void remove_interstitial_page() {
-    DCHECK(interstitial_page_);
-    interstitial_page_ = NULL;
-  }
+  void remove_interstitial_page();
 
   // Returns the currently showing interstitial, NULL if no interstitial is
   // showing.
diff --git a/chrome/browser/tab_contents/thumbnail_generator.h b/chrome/browser/tab_contents/thumbnail_generator.h
index 51fc1ff..223a0d0 100644
--- a/chrome/browser/tab_contents/thumbnail_generator.h
+++ b/chrome/browser/tab_contents/thumbnail_generator.h
@@ -13,7 +13,6 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/linked_ptr.h"
-#include "base/lock.h"
 #include "base/timer.h"
 #include "chrome/browser/renderer_host/render_widget_host_painting_observer.h"
 #include "chrome/common/notification_observer.h"
diff --git a/chrome/browser/transport_security_persister.h b/chrome/browser/transport_security_persister.h
index 7db6b58..ca3a871 100644
--- a/chrome/browser/transport_security_persister.h
+++ b/chrome/browser/transport_security_persister.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -34,8 +34,9 @@
 #define CHROME_BROWSER_TRANSPORT_SECURITY_PERSISTER_H_
 #pragma once
 
+#include <string>
+
 #include "base/file_path.h"
-#include "base/lock.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
 #include "net/base/transport_security_state.h"
diff --git a/chrome/browser/utility_process_host.h b/chrome/browser/utility_process_host.h
index 48d5e38..4b32f82 100644
--- a/chrome/browser/utility_process_host.h
+++ b/chrome/browser/utility_process_host.h
@@ -11,7 +11,6 @@
 
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "base/task.h"
 #include "chrome/browser/browser_child_process_host.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/common/extensions/update_manifest.h"
diff --git a/chrome/browser/worker_host/message_port_dispatcher.h b/chrome/browser/worker_host/message_port_dispatcher.h
index 566416b..cadd9d5 100644
--- a/chrome/browser/worker_host/message_port_dispatcher.h
+++ b/chrome/browser/worker_host/message_port_dispatcher.h
@@ -14,7 +14,6 @@
 #include "base/callback.h"
 #include "base/singleton.h"
 #include "base/string16.h"
-#include "base/task.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "ipc/ipc_message.h"
diff --git a/chrome/default_plugin/plugin_install_job_monitor.cc b/chrome/default_plugin/plugin_install_job_monitor.cc
index 4e19057..cbd50d1 100644
--- a/chrome/default_plugin/plugin_install_job_monitor.cc
+++ b/chrome/default_plugin/plugin_install_job_monitor.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/default_plugin/plugin_install_job_monitor.h"
 
+#include "base/logging.h"
 #include "base/message_loop.h"
 #include "chrome/default_plugin/plugin_impl.h"
 
@@ -99,6 +100,11 @@ void PluginInstallationJobMonitorThread::Stop() {
   install_job_completion_port_ = NULL;
 }
 
+void PluginInstallationJobMonitorThread::set_plugin_window(HWND plugin_window) {
+  DCHECK(::IsWindow(plugin_window));
+  plugin_window_ = plugin_window;
+}
+
 bool PluginInstallationJobMonitorThread::AssignProcessToJob(
     HANDLE process_handle) {
   BOOL result = AssignProcessToJobObject(install_job_, process_handle);
diff --git a/chrome/default_plugin/plugin_install_job_monitor.h b/chrome/default_plugin/plugin_install_job_monitor.h
index 5211f45..eb58145 100644
--- a/chrome/default_plugin/plugin_install_job_monitor.h
+++ b/chrome/default_plugin/plugin_install_job_monitor.h
@@ -8,7 +8,6 @@
 
 #include <windows.h>
 
-#include "base/logging.h"
 #include "base/thread.h"
 #include "base/ref_counted.h"
 
@@ -16,10 +15,9 @@
 // The PluginInstallationJobMonitorThread class represents a background
 // thread which monitors the install job completion port which is associated
 // with the job when an instance of this class is initialized.
-class PluginInstallationJobMonitorThread :
-    public base::Thread,
-    public base::RefCountedThreadSafe<PluginInstallationJobMonitorThread> {
-
+class PluginInstallationJobMonitorThread
+    : public base::Thread,
+      public base::RefCountedThreadSafe<PluginInstallationJobMonitorThread> {
  public:
   PluginInstallationJobMonitorThread();
 
@@ -32,10 +30,7 @@ class PluginInstallationJobMonitorThread :
   void Stop();
 
   // Simple setter/getters for the plugin window handle.
-  void set_plugin_window(HWND plugin_window) {
-    DCHECK(::IsWindow(plugin_window));
-    plugin_window_ = plugin_window;
-  }
+  void set_plugin_window(HWND plugin_window);
 
   HWND plugin_window() const {
     return plugin_window_;
diff --git a/chrome/gpu/gpu_channel.cc b/chrome/gpu/gpu_channel.cc
index 6d97a3d..e7f9fc0 100644
--- a/chrome/gpu/gpu_channel.cc
+++ b/chrome/gpu/gpu_channel.cc
@@ -9,7 +9,6 @@
 #endif
 
 #include "base/command_line.h"
-#include "base/lock.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/common/child_process.h"
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index cbd2c97..74d5999 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -11,7 +11,6 @@
 
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
-#include "base/task.h"
 #include "chrome/plugin/command_buffer_stub.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/renderer/notification_provider.cc b/chrome/renderer/notification_provider.cc
index 0196d0c..c7e36ce 100644
--- a/chrome/renderer/notification_provider.cc
+++ b/chrome/renderer/notification_provider.cc
@@ -5,7 +5,6 @@
 #include "chrome/renderer/notification_provider.h"
 
 #include "base/string_util.h"
-#include "base/task.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/service/service_utility_process_host.h b/chrome/service/service_utility_process_host.h
index 477e945..e5dde60 100644
--- a/chrome/service/service_utility_process_host.h
+++ b/chrome/service/service_utility_process_host.h
@@ -17,7 +17,6 @@
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/ref_counted.h"
-#include "base/task.h"
 #include "ipc/ipc_channel.h"
 #include "chrome/service/service_child_process_host.h"
 #include "printing/native_metafile.h"