Fix a bunch of header includes. I removed some unnecessary headers from a

variety of places and added ones in other files that were accidentally
depending on them.
Review URL: http://codereview.chromium.org/19742

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

25 files changed, 46 insertions, 35 deletions

diff --git a/chrome/browser/autofill_manager.cc b/chrome/browser/autofill_manager.cc
index 65396a7..0f11160 100644
--- a/chrome/browser/autofill_manager.cc
+++ b/chrome/browser/autofill_manager.cc
@@ -7,6 +7,7 @@
 #include "base/string_util.h"

 #include "chrome/browser/profile.h"

 #include "chrome/browser/tab_contents/web_contents.h"

+#include "chrome/common/pref_names.h"

 

 AutofillManager::AutofillManager(WebContents* web_contents) :

     web_contents_(web_contents),

diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index a159e62..4f2ae9f 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -8,8 +8,10 @@
 #include "base/file_util.h"
 #include "base/json_writer.h"
 #include "base/message_loop.h"
+#include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/json_value_serializer.h"
diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h
index c6416d4..f63aa81 100644
--- a/chrome/browser/bookmarks/bookmark_storage.h
+++ b/chrome/browser/bookmarks/bookmark_storage.h
@@ -7,13 +7,17 @@
 
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/browser/browser_process.h"
 
 class BookmarkModel;
 class BookmarkStorageBackend;
 class Profile;
+class MessageLoop;
 class Value;
 
+namespace base {
+class Thread;
+}
+
 // BookmarkStorage handles reading/write the bookmark bar model. The
 // BookmarkModel uses the BookmarkStorage to load bookmarks from disk, as well
 // as notifying the BookmarkStorage every time the model changes.
diff --git a/chrome/browser/browser_process.cc b/chrome/browser/browser_process.cc
index 9ed6fb6..8f29cbc 100644
--- a/chrome/browser/browser_process.cc
+++ b/chrome/browser/browser_process.cc
@@ -6,3 +6,13 @@
 
 BrowserProcess* g_browser_process = NULL;
 
+#if defined(OS_WIN)
+
+#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
+
+DownloadRequestManager* BrowserProcess::download_request_manager() {
+  ResourceDispatcherHost* rdh = resource_dispatcher_host();
+  return rdh ? rdh->download_request_manager() : NULL;
+}
+
+#endif
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 7343737..b4f6a46 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -14,10 +14,6 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "base/message_loop.h"
-#if defined(OS_WIN)
-#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#endif  // defined(OS_WIN)
 
 class AutomationProviderList;
 class ClipboardService;
@@ -123,10 +119,7 @@ class BrowserProcess {
   virtual MemoryModel memory_model() = 0;
 
 #if defined(OS_WIN)
-  DownloadRequestManager* download_request_manager() {
-    ResourceDispatcherHost* rdh = resource_dispatcher_host();
-    return rdh ? rdh->download_request_manager() : NULL;
-  }
+  DownloadRequestManager* download_request_manager();
 #endif
 
   // Returns an event that is signaled when the browser shutdown.
diff --git a/chrome/browser/cache_manager_host.cc b/chrome/browser/cache_manager_host.cc
index 143eddd..38db812 100644
--- a/chrome/browser/cache_manager_host.cc
+++ b/chrome/browser/cache_manager_host.cc
@@ -14,6 +14,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/notification_service.h"
+#include "chrome/common/render_messages.h"
 
 using base::Time;
 using base::TimeDelta;
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc
index e058477..0e1ff11 100644
--- a/chrome/browser/chrome_plugin_host.cc
+++ b/chrome/browser/chrome_plugin_host.cc
@@ -18,6 +18,7 @@
 #include "net/url_request/url_request_error_job.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/chrome_plugin_browsing_context.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/html_dialog_contents.h"
 #include "chrome/browser/net/dns_master.h"
 #include "chrome/browser/plugin_process_host.h"
diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc
index da69a35..7bddfd0f 100755
--- a/chrome/browser/first_run.cc
+++ b/chrome/browser/first_run.cc
@@ -23,6 +23,7 @@
 #include "chrome/app/result_codes.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/hang_monitor/hung_window_detector.h"
 #include "chrome/browser/importer/importer.h"
diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index f39e365..32a32dc 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -9,6 +9,7 @@
 #include "base/command_line.h"
 #include "chrome/browser/browser_process_impl.h"
 
+class FilePath;
 class Profile;
 
 // This class contains the chrome first-run installation actions needed to
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 1274d09..d299bec 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -32,17 +32,17 @@
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/download_types.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/in_memory_database.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
+#include "chrome/browser/profile.h"
 #include "chrome/browser/visitedlink_master.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
-#include "chrome/common/sqlite_utils.h"
-#include "chrome/common/thumbnail_score.h"
 
 #include "chromium_strings.h"
 #include "generated_resources.h"
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index ddf9b16..37ade4f 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -17,7 +17,6 @@
 #include "base/task.h"
 #include "base/time.h"
 #include "chrome/browser/cancelable_request.h"
-#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ -26,6 +25,7 @@
 #include "chrome/common/ref_counted_util.h"
 
 class BookmarkService;
+class ChromeThread;
 struct DownloadCreateInfo;
 class FilePath;
 class GURL;
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 33be3f2..38ff884 100755
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -10,6 +10,7 @@
 #include "base/file_util.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
+#include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 321d8cf..f2c3f79 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -13,6 +13,7 @@
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_trial.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/plugin_process_host.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h
index d7ad9ae..c569bdb 100644
--- a/chrome/browser/plugin_service.h
+++ b/chrome/browser/plugin_service.h
@@ -13,6 +13,7 @@
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/lock.h"
+#include "base/ref_counted.h"
 #include "chrome/browser/browser_process.h"
 #include "webkit/glue/webplugin.h"
 
@@ -20,6 +21,7 @@ namespace IPC {
 class Message;
 }
 
+class MessageLoop;
 class PluginProcessHost;
 class URLRequestContext;
 class ResourceDispatcherHost;
diff --git a/chrome/browser/printing/win_printing_context.cc b/chrome/browser/printing/win_printing_context.cc
index 1b8b055..9bc0cae 100644
--- a/chrome/browser/printing/win_printing_context.cc
+++ b/chrome/browser/printing/win_printing_context.cc
@@ -7,6 +7,8 @@
 #include <winspool.h>
 
 #include "base/file_util.h"
+#include "base/message_loop.h"
+#include "base/time.h"
 #include "base/time_format.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/printing/print_job_manager.h"
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index bdbf4a0..7d29654 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -7,11 +7,9 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/lock.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
-#include "base/values.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
@@ -25,18 +23,12 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/net/cookie_monster_sqlite.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/resource_bundle.h"
-#include "net/base/cookie_monster.h"
-#include "net/base/cookie_policy.h"
-#include "net/http/http_cache.h"
-#include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request_context.h"
-#include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_POSIX)
 // TODO(port): get rid of this include. It's used just to provide declarations
diff --git a/chrome/browser/profile.h b/chrome/browser/profile.h
index ef2f713..754a97a 100644
--- a/chrome/browser/profile.h
+++ b/chrome/browser/profile.h
@@ -12,16 +12,12 @@
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
-#include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "base/task.h"
 #include "base/timer.h"
 #ifdef CHROME_PERSONALIZATION
 #include "chrome/personalization/personalization.h"
 #endif
 #include "chrome/common/notification_observer.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/common/pref_service.h"
 
 class BookmarkModel;
 class ChromeURLRequestContext;
@@ -42,7 +38,6 @@ class WebDataService;
 
 class Profile {
  public:
-
   // Profile services are accessed with the following parameter. This parameter
   // defines what the caller plans to do with the service.
   // The caller is responsible for not performing any operation that would
diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc
index 95c3942..584f503 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.cc
+++ b/chrome/browser/renderer_host/browser_render_process_host.cc
@@ -42,6 +42,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/process_watcher.h"
+#include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_process.h"
 #include "net/base/cookie_monster.h"
 #include "net/base/net_util.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h
index b4ce17a..7903a46 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.h
+++ b/chrome/browser/renderer_host/browser_render_process_host.h
@@ -20,10 +20,12 @@
 #include "base/rand_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/shared_memory.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/common/notification_observer.h"
-#include "chrome/common/render_messages.h"
+#include "webkit/glue/cache_manager.h"
 
+class GURL;
 class PrefService;
 class RenderWidgetHelper;
 class WebContents;
@@ -32,6 +34,10 @@ namespace base {
 class Thread;
 }
 
+namespace gfx {
+class Size;
+}
+
 // Implements a concrete RenderProcessHost for the browser process for talking
 // to actual renderer processes (as opposed to mocks).
 //
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index af0d810..dceab2e 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -4,25 +4,20 @@
 
 #include "chrome/browser/tab_contents/navigation_controller.h"
 
-#include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/dom_ui_host.h"
-#include "chrome/browser/profile.h"
 #include "chrome/browser/repost_form_warning_dialog.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/site_instance.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "chrome/common/scoped_vector.h"
-#include "net/base/net_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 namespace {
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc
index 5f82bc0..589c0cb 100644
--- a/chrome/browser/tab_contents/web_contents.cc
+++ b/chrome/browser/tab_contents/web_contents.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_request_manager.h"
-#include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/google_util.h"
 #include "chrome/browser/js_before_unload_handler.h"
 #include "chrome/browser/jsmessage_box_handler.h"
@@ -41,9 +40,7 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
-#include "net/base/mime_util.h"
 #include "net/base/registry_controlled_domain.h"
-#include "webkit/glue/webkit_glue.h"
 
 #include "generated_resources.h"
 
diff --git a/chrome/browser/tab_contents/web_contents.h b/chrome/browser/tab_contents/web_contents.h
index c3094a4..55f1ee7 100644
--- a/chrome/browser/tab_contents/web_contents.h
+++ b/chrome/browser/tab_contents/web_contents.h
@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_WEB_CONTENTS_H_
 
-#include "base/hash_tables.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/fav_icon_helper.h"
 #include "chrome/browser/printing/print_view_manager.h"
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 5b6482c..efb8360 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/thread.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 3d08372..a6ab4cf 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -43,6 +43,7 @@
 #include "chrome/common/notification_service.h"
 #include "chrome/common/os_exchange_data.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/pref_service.h"
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/hwnd_notification_source.h"
diff --git a/chrome/browser/visitedlink_master.h b/chrome/browser/visitedlink_master.h
index c68e4c7..fb38848 100644
--- a/chrome/browser/visitedlink_master.h
+++ b/chrome/browser/visitedlink_master.h
@@ -27,6 +27,10 @@
 class GURL;
 class Profile;
 
+namespace base {
+class Thread;
+}  // namespace base
+
 // Controls the link coloring database. The master controls all writing to the
 // database as well as disk I/O. There should be only one master.
 //