Headers cleanup in chrome/browser/

- reduce header dependencies
- miscellanous cleanups (add missing includes for OS_ defines etc)

Further changesets may follow. I was only looking at header files up to character_encoding.h.

Review URL: http://codereview.chromium.org/118072

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

57 files changed, 76 insertions, 47 deletions

diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc
index 65a98b3..0ed7b88 100644
--- a/chrome/browser/alternate_nav_url_fetcher.cc
+++ b/chrome/browser/alternate_nav_url_fetcher.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 32afd0b..68094ef 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -12,6 +12,7 @@
 #include "chrome/browser/browser_init.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/browser_window.h"
 #import "chrome/browser/cocoa/about_window_controller.h"
 #import "chrome/browser/cocoa/bookmark_menu_bridge.h"
 #import "chrome/browser/cocoa/clear_browsing_data_controller.h"
@@ -65,7 +66,7 @@
   // window changes.
   NSNotificationCenter* notificationCenter =
       [NSNotificationCenter defaultCenter];
-  [notificationCenter 
+  [notificationCenter
       addObserver:self
          selector:@selector(windowLayeringDidChange:)
              name:NSWindowDidBecomeKeyNotification
@@ -161,7 +162,7 @@
 // update the UI based on the new main window.
 - (void)windowLayeringDidChange:(NSNotification*)notify {
   [self delayedFixCloseMenuItemKeyEquivalents];
-  
+
   // TODO(pinkerton): If we have other things here, such as inspector panels
   // that follow the contents of the selected webpage, we would update those
   // here.
@@ -366,7 +367,7 @@
   // if no browser window exists then create one with no tabs to be filled in
   if (!browser) {
     browser = Browser::Create([self defaultProfile]);
-    browser->window()->Show();    
+    browser->window()->Show();
   }
 
   CommandLine dummy((std::wstring()));
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
index 80bb192..7ac02d9 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h
@@ -9,7 +9,6 @@
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/owned_widget_gtk.h"
@@ -23,7 +22,6 @@ class AutocompletePopupViewGtk;
 class CommandUpdater;
 class Profile;
 class TabContents;
-class ToolbarModel;
 
 class AutocompleteEditViewGtk : public AutocompleteEditView {
  public:
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view.h b/chrome/browser/autocomplete/autocomplete_popup_view.h
index f287d63..9ccb614 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view.h
@@ -11,6 +11,8 @@
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_H_
 
+#include "build/build_config.h"
+
 class AutocompleteEditView;
 class AutocompletePopupModel;
 namespace gfx {
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h
index 70e5ad6..bed813b 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h
@@ -7,11 +7,8 @@
 
 #include <gtk/gtk.h>
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "webkit/glue/window_open_disposition.h"
 
diff --git a/chrome/browser/autocomplete/history_contents_provider.h b/chrome/browser/autocomplete/history_contents_provider.h
index b99b21e..6d1dba1 100644
--- a/chrome/browser/autocomplete/history_contents_provider.h
+++ b/chrome/browser/autocomplete/history_contents_provider.h
@@ -6,9 +6,12 @@
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H_
 
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
 
+namespace bookmark_utils {
+struct TitleMatch;
+}
+
 // HistoryContentsProvider is an AutocompleteProvider that provides results from
 // the contents (body and/or title) of previously visited pages.
 // HistoryContentsProvider gets results from two sources:
diff --git a/chrome/browser/autocomplete/history_url_provider.h b/chrome/browser/autocomplete/history_url_provider.h
index 2f95594..d133514 100644
--- a/chrome/browser/autocomplete/history_url_provider.h
+++ b/chrome/browser/autocomplete/history_url_provider.h
@@ -5,21 +5,18 @@
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_HISTORY_URL_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_URL_PROVIDER_H_
 
-#include <map>
 #include <vector>
 #include <deque>
 
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/browser/history/history_database.h"
-#include "chrome/browser/profile.h"
+#include "chrome/browser/history/history_types.h"
 
 class HistoryService;
 class MessageLoop;
+class Profile;
 
 namespace history {
-
 class HistoryBackend;
-
 }  // namespace history
 
 
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 9d2dce4..fb02d7e 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_util.h"
+#include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index e36a2ef..9b0ef38 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -20,7 +20,8 @@
 #include <vector>
 
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/browser/history/history.h"
+#include "chrome/browser/cancelable_request.h"
+#include "chrome/browser/history/history_types.h"
 #include "chrome/browser/net/url_fetcher.h"
 #include "chrome/browser/search_engines/template_url.h"
 
@@ -179,7 +180,7 @@ class SearchProvider : public AutocompleteProvider,
   void StopSuggest();
 
   // Schedules a history query requesting past searches against the engine
-  // whose id is |search_id| and whose text starts with |text|. 
+  // whose id is |search_id| and whose text starts with |text|.
   void ScheduleHistoryQuery(TemplateURL::IDType search_id,
                             const std::wstring& text);
 
diff --git a/chrome/browser/autofill_manager.h b/chrome/browser/autofill_manager.h
index f251954..020c2ce 100644
--- a/chrome/browser/autofill_manager.h
+++ b/chrome/browser/autofill_manager.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_MANAGER_H_
 
-#include <map>
 #include <string>
 
 #include "chrome/browser/webdata/web_data_service.h"
diff --git a/chrome/browser/automation/automation_autocomplete_edit_tracker.h b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
index 88e38d4..4911ff7 100644
--- a/chrome/browser/automation/automation_autocomplete_edit_tracker.h
+++ b/chrome/browser/automation/automation_autocomplete_edit_tracker.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_AUTOCOMPLETE_EDIT_TRACKER_H_
 
-#include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/automation/automation_resource_tracker.h"
 #include "chrome/common/notification_source.h"
diff --git a/chrome/browser/automation/automation_browser_tracker.h b/chrome/browser/automation/automation_browser_tracker.h
index 2f14c97..e57e0e8 100644
--- a/chrome/browser/automation/automation_browser_tracker.h
+++ b/chrome/browser/automation/automation_browser_tracker.h
@@ -7,7 +7,6 @@
 
 #include "chrome/browser/automation/automation_resource_tracker.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/browser_process.h"
 
 // Tracks Browser objects.
 class AutomationBrowserTracker : public AutomationResourceTracker<Browser*> {
diff --git a/chrome/browser/automation/automation_constrained_window_tracker.h b/chrome/browser/automation/automation_constrained_window_tracker.h
index 47d1f99..fe4261a 100644
--- a/chrome/browser/automation/automation_constrained_window_tracker.h
+++ b/chrome/browser/automation/automation_constrained_window_tracker.h
@@ -6,8 +6,6 @@
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_CONSTRAINED_WINDOW_TRACKER_H__
 
 #include "chrome/browser/automation/automation_resource_tracker.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 
 class AutomationConstrainedWindowTracker
diff --git a/chrome/browser/automation/automation_extension_function.h b/chrome/browser/automation/automation_extension_function.h
index a399cd7..e10d04c 100644
--- a/chrome/browser/automation/automation_extension_function.h
+++ b/chrome/browser/automation/automation_extension_function.h
@@ -9,7 +9,6 @@
 
 #include <string>
 
-#include "base/singleton.h"
 #include "chrome/browser/extensions/extension_function.h"
 
 class RenderViewHost;
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 9de02a6..1506868 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -24,9 +24,9 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/common/ipc_message.h"
-#include "chrome/common/ipc_sync_channel.h"
+#include "chrome/common/ipc_channel.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/test/automation/automation_messages.h"
+#include "chrome/test/automation/automation_constants.h"
 #if defined(OS_WIN)
 #include "views/event.h"
 #endif  // defined(OS_WIN)
@@ -34,9 +34,14 @@
 #if defined(OS_WIN)
 // TODO(port): enable these.
 #include "chrome/browser/automation/automation_constrained_window_tracker.h"
-enum AutomationMsg_NavigationResponseValues;
 #endif
 
+struct AutomationMsg_Find_Params;
+
+namespace IPC {
+struct Reposition_Params;
+}
+
 class LoginHandler;
 class NavigationControllerRestoredObserver;
 class ExternalTabContainer;
diff --git a/chrome/browser/automation/automation_resource_tracker.h b/chrome/browser/automation/automation_resource_tracker.h
index a5ba0aa..859a179 100644
--- a/chrome/browser/automation/automation_resource_tracker.h
+++ b/chrome/browser/automation/automation_resource_tracker.h
@@ -9,8 +9,11 @@
 
 #include "base/basictypes.h"
 #include "chrome/common/ipc_message.h"
+#include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
-#include "chrome/common/notification_service.h"
+#include "chrome/common/notification_type.h"
+
+template <class T> class Source;
 
 // Template trick so that AutomationResourceTracker can be used with non-pointer
 // types.
diff --git a/chrome/browser/automation/automation_tab_tracker.h b/chrome/browser/automation/automation_tab_tracker.h
index 2674bde..8137721 100644
--- a/chrome/browser/automation/automation_tab_tracker.h
+++ b/chrome/browser/automation/automation_tab_tracker.h
@@ -5,9 +5,10 @@
 #ifndef CHROME_BROWSER_AUTOMATION_AUTOMATION_TAB_TRACKER_H_
 #define CHROME_BROWSER_AUTOMATION_AUTOMATION_TAB_TRACKER_H_
 
+#include <map>
+
+#include "base/time.h"
 #include "chrome/browser/automation/automation_resource_tracker.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_process.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_type.h"
diff --git a/chrome/browser/automation/extension_port_container.cc b/chrome/browser/automation/extension_port_container.cc
index 6de6f42..a0846e5 100644
--- a/chrome/browser/automation/extension_port_container.cc
+++ b/chrome/browser/automation/extension_port_container.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
+#include "chrome/test/automation/automation_messages.h"
 
 // TODO(siggi): Find a more structured way to read and write JSON messages.
 
diff --git a/chrome/browser/automation/extension_port_container.h b/chrome/browser/automation/extension_port_container.h
index 833b394..2758a9d 100644
--- a/chrome/browser/automation/extension_port_container.h
+++ b/chrome/browser/automation/extension_port_container.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/ref_counted.h"
 #include "chrome/common/ipc_message.h"
 
 class AutomationProvider;
diff --git a/chrome/browser/automation/url_request_mock_net_error_job.cc b/chrome/browser/automation/url_request_mock_net_error_job.cc
index 0b9a20a..dffbcd8 100644
--- a/chrome/browser/automation/url_request_mock_net_error_job.cc
+++ b/chrome/browser/automation/url_request_mock_net_error_job.cc
@@ -7,6 +7,7 @@
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
+#include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_filter.h"
 
diff --git a/chrome/browser/automation/url_request_mock_net_error_job.h b/chrome/browser/automation/url_request_mock_net_error_job.h
index b3c25f6..6f082ae 100644
--- a/chrome/browser/automation/url_request_mock_net_error_job.h
+++ b/chrome/browser/automation/url_request_mock_net_error_job.h
@@ -10,7 +10,6 @@
 #define CHROME_BROWSER_AUTOMATION_URL_REQUEST_MOCK_NET_ERROR_H__
 
 #include "chrome/browser/automation/url_request_mock_http_job.h"
-#include "net/base/net_errors.h"
 
 class URLRequestMockNetErrorJob : public URLRequestMockHTTPJob {
  public:
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 964df01..c3e6dd3 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 13fea9c..b2950fd 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -10,8 +10,9 @@
 #include <set>
 #include <vector>
 
+#include "base/gfx/rect.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_window.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/sessions/session_id.h"
@@ -22,9 +23,6 @@
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/pref_member.h"
-#include "base/gfx/rect.h"
-#include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class BrowserIdleTimer;
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index c8d3d5d..9a1760d 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -20,6 +20,7 @@
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/first_run.h"
diff --git a/chrome/browser/browser_init.h b/chrome/browser/browser_init.h
index fec8990..f688692 100644
--- a/chrome/browser/browser_init.h
+++ b/chrome/browser/browser_init.h
@@ -139,7 +139,7 @@ class BrowserInit {
                                  bool process_startup, Profile* profile,
                                  int* return_code, BrowserInit* browser_init);
 
-  // Additional tabs to open during first run. 
+  // Additional tabs to open during first run.
   std::vector<GURL> first_run_tabs_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserInit);
diff --git a/chrome/browser/browser_list.h b/chrome/browser/browser_list.h
index 38d3328..fda1aa4 100644
--- a/chrome/browser/browser_list.h
+++ b/chrome/browser/browser_list.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_BROWSER_LIST_H__
 #define CHROME_BROWSER_BROWSER_LIST_H__
 
-#include <algorithm>
 #include <vector>
 
 #include "chrome/browser/browser.h"
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 3a5027b..63d8743 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -13,10 +13,8 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/non_thread_safe.h"
-#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index ce59a42..86e0c3a 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -8,6 +8,7 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/theme_resources_util.h"
diff --git a/chrome/browser/browsing_instance.cc b/chrome/browser/browsing_instance.cc
index 096e6d5..2acb412 100644
--- a/chrome/browser/browsing_instance.cc
+++ b/chrome/browser/browsing_instance.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/browsing_instance.h"
 
 #include "base/command_line.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
diff --git a/chrome/browser/browsing_instance.h b/chrome/browser/browsing_instance.h
index 54516b5..27ef405 100644
--- a/chrome/browser/browsing_instance.h
+++ b/chrome/browser/browsing_instance.h
@@ -6,9 +6,11 @@
 #define CHROME_BROWSER_BROWSING_INSTANCE_H__
 
 #include "base/hash_tables.h"
-#include "chrome/browser/profile.h"
-#include "googleurl/src/gurl.h"
+#include "base/logging.h"
+#include "base/ref_counted.h"
 
+class GURL;
+class Profile;
 class SiteInstance;
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/cert_store.h b/chrome/browser/cert_store.h
index 7ef3b3e..995a3db 100644
--- a/chrome/browser/cert_store.h
+++ b/chrome/browser/cert_store.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_CERT_STORE_H_
 #define CHROME_BROWSER_CERT_STORE_H_
 
-#include <vector>
 #include <map>
 
 #include "base/lock.h"
@@ -77,7 +76,7 @@ class CertStore : public NotificationObserver {
   //                     cert_to_id_.
   Lock cert_lock_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CertStore);
+  DISALLOW_COPY_AND_ASSIGN(CertStore);
 };
 
 #endif  // CHROME_BROWSER_CERT_STORE_H_
diff --git a/chrome/browser/character_encoding.h b/chrome/browser/character_encoding.h
index bc8a83f..a676403 100644
--- a/chrome/browser/character_encoding.h
+++ b/chrome/browser/character_encoding.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_CHARACTER_ENCODING_H__
 
 #include <string>
-#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index ef82130..30e03d0 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -5,6 +5,7 @@
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/debugger/devtools_client_host.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_window.h"
@@ -30,7 +31,7 @@ DevToolsWindow::DevToolsWindow(Profile* profile)
 
     PrefService* prefs = g_browser_process->local_state();
     prefs->RegisterDictionaryPref(g_wp_key.c_str());
-    
+
     const DictionaryValue* wp_pref = prefs->GetDictionary(g_wp_key.c_str());
     if (!wp_pref) {
       DictionaryValue* defaults = prefs->GetMutableDictionary(

@@ -61,7 +62,7 @@ void DevToolsWindow::Show() {
 }
 
 DevToolsWindow* DevToolsWindow::AsDevToolsWindow() {
-  return this; 
+  return this;
 }
 
 RenderViewHost* DevToolsWindow::GetRenderViewHost() const {
diff --git a/chrome/browser/dock_info_gtk.cc b/chrome/browser/dock_info_gtk.cc
index 801b7c1..e64b966 100644
--- a/chrome/browser/dock_info_gtk.cc
+++ b/chrome/browser/dock_info_gtk.cc
@@ -9,6 +9,7 @@
 #include "base/gfx/native_widget_types.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 
 // static
 DockInfo DockInfo::GetDockInfoAtPoint(const gfx::Point& screen_point,
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc
index 6bd2244..a3868fa 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/extension_tabs_module.cc
@@ -7,9 +7,11 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extensions_service.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/window_sizer.h"
diff --git a/chrome/browser/extensions/extension_view_unittest.cc b/chrome/browser/extensions/extension_view_unittest.cc
index b344330..da4374e 100644
--- a/chrome/browser/extensions/extension_view_unittest.cc
+++ b/chrome/browser/extensions/extension_view_unittest.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/test_extension_loader.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index f29f68c..62a26cd 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -9,6 +9,7 @@
 #include "app/gfx/favicon_size.h"
 #include "base/gfx/png_decoder.h"
 #include "base/gfx/png_encoder.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc
index d815d7e..96b4758 100644
--- a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc
+++ b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h"
 
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/gtk/tabs/dragged_tab_gtk.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
index 700f492..00f3fbf 100644
--- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 872e6fa..220f3cc 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/download_types.h"
 #include "chrome/browser/history/history_backend.h"
diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc
index ae95ec9..c25322a 100644
--- a/chrome/browser/profile_manager.cc
+++ b/chrome/browser/profile_manager.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc
index b165193..9e88f42 100644
--- a/chrome/browser/sessions/session_restore.cc
+++ b/chrome/browser/sessions/session_restore.cc
@@ -10,6 +10,7 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_types.h"
diff --git a/chrome/browser/sessions/tab_restore_service.cc b/chrome/browser/sessions/tab_restore_service.cc
index 5399c21..d857de9 100644
--- a/chrome/browser/sessions/tab_restore_service.cc
+++ b/chrome/browser/sessions/tab_restore_service.cc
@@ -10,6 +10,7 @@
 #include "base/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_command.h"
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 184932a..ca1d92d 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/browser.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index aefcf14..b453092 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -12,6 +12,7 @@
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "chrome/browser/cert_store.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/ssl/ssl_cert_error_handler.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
diff --git a/chrome/browser/ssl/ssl_policy_backend.cc b/chrome/browser/ssl/ssl_policy_backend.cc
index 8852190..e249252 100644
--- a/chrome/browser/ssl/ssl_policy_backend.cc
+++ b/chrome/browser/ssl/ssl_policy_backend.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ssl/ssl_policy_backend.h"
 
 #include "app/resource_bundle.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_host_state.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index 076d525..4a19e58 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/browser_about_handler.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_url_handler.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/repost_form_warning.h"
diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc
index b2235bc..5a3ea92 100644
--- a/chrome/browser/tab_contents/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 
 #include "app/resource_bundle.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index a8a1247..b0d5b71 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -31,6 +31,7 @@
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
diff --git a/chrome/browser/task_manager_win.cc b/chrome/browser/task_manager_win.cc
index 3f8c8dd..fcf6639 100644
--- a/chrome/browser/task_manager_win.cc
+++ b/chrome/browser/task_manager_win.cc
@@ -9,6 +9,7 @@
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc
index e2ee68f..75e0f91 100644
--- a/chrome/browser/toolbar_model.cc
+++ b/chrome/browser/toolbar_model.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "chrome/browser/cert_store.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
diff --git a/chrome/browser/views/find_bar_win_browsertest.cc b/chrome/browser/views/find_bar_win_browsertest.cc
index 9a9c228..724b7c6 100644
--- a/chrome/browser/views/find_bar_win_browsertest.cc
+++ b/chrome/browser/views/find_bar_win_browsertest.cc
@@ -4,6 +4,7 @@
 
 #include "base/message_loop.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index f8f5532..3714952 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -26,6 +26,7 @@
 #include "chrome/browser/extensions/extension_shelf.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/browser/views/browser_bubble.h"
diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index 6775548..b7bf9d7 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -6,6 +6,7 @@
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/button/checkbox.h"
diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc
index 943d8d5..c9ef167 100644
--- a/chrome/browser/views/repost_form_warning_view.cc
+++ b/chrome/browser/views/repost_form_warning_view.cc
@@ -7,6 +7,7 @@
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 5ab4dcd..f4064701 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -19,6 +19,7 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
@@ -96,7 +97,7 @@ BrowserToolbarView::BrowserToolbarView(Browser* browser)
       profile_(NULL),
       browser_(browser),
       tab_(NULL),
-      profiles_menu_(NULL),      
+      profiles_menu_(NULL),
       profiles_helper_(new GetProfilesHelper(this)) {
   browser_->command_updater()->AddCommandObserver(IDC_BACK, this);
   browser_->command_updater()->AddCommandObserver(IDC_FORWARD, this);
@@ -868,7 +869,7 @@ void BrowserToolbarView::WriteDragData(views::View* sender,
       GetDragOperations(sender, press_x, press_y) != DragDropTypes::DRAG_NONE);
 
   UserMetrics::RecordAction(L"Toolbar_DragStar", profile_);
-  
+
 #if defined(OS_WIN)
   // If there is a bookmark for the URL, add the bookmark drag data for it. We
   // do this to ensure the bookmark is moved, rather than creating an new
diff --git a/chrome/browser/window_sizer_linux.cc b/chrome/browser/window_sizer_linux.cc
index f8800a7..109d983 100644
--- a/chrome/browser/window_sizer_linux.cc
+++ b/chrome/browser/window_sizer_linux.cc
@@ -9,6 +9,7 @@
 #include "base/logging.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/browser_window.h"
 
 // How much horizontal and vertical offset there is between newly
 // opened windows. We don't care on Linux since the window manager generally