Headers cleanup in chrome/common

- reduce header dependencies
- miscellanous cleanups (whitespace, explicit deps)

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

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

21 files changed, 30 insertions, 32 deletions

diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index 1fbbb38..b40b6ff 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -12,6 +12,7 @@
 #include "base/thread.h"
 #include "base/time.h"
 #include "base/time_format.h"
+#include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_ui/dom_ui_favicon_source.h"
diff --git a/chrome/browser/history/url_database.h b/chrome/browser/history/url_database.h
index 2a73794..e44108f 100644
--- a/chrome/browser/history/url_database.h
+++ b/chrome/browser/history/url_database.h
@@ -8,6 +8,7 @@
 #include "base/basictypes.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/search_engines/template_url.h"
+#include "chrome/common/sqlite_utils.h"
 
 // Temporary until DBCloseScoper moves elsewhere.
 #include "chrome/common/sqlite_compiled_statement.h"
diff --git a/chrome/common/child_process.cc b/chrome/common/child_process.cc
index 326c7df..f32708c 100644
--- a/chrome/common/child_process.cc
+++ b/chrome/common/child_process.cc
@@ -4,8 +4,7 @@
 
 #include "chrome/common/child_process.h"
 
-#include "base/basictypes.h"
-#include "base/string_util.h"
+#include "base/message_loop.h"
 #include "chrome/common/child_thread.h"
 
 ChildProcess* ChildProcess::child_process_;
diff --git a/chrome/common/child_process.h b/chrome/common/child_process.h
index 23bfad8..1366a02 100644
--- a/chrome/common/child_process.h
+++ b/chrome/common/child_process.h
@@ -5,16 +5,12 @@
 #ifndef CHROME_COMMON_CHILD_PROCESS_H__
 #define CHROME_COMMON_CHILD_PROCESS_H__
 
-#include <string>
-#include <vector>
 #include "base/basictypes.h"
-#include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/waitable_event.h"
 
 class ChildThread;
 
-
 // Base class for child processes of the browser process (i.e. renderer and
 // plugin host). This is a singleton object for each child process.
 class ChildProcess {
diff --git a/chrome/common/child_process_host.h b/chrome/common/child_process_host.h
index 5a49a44..bf320d3 100644
--- a/chrome/common/child_process_host.h
+++ b/chrome/common/child_process_host.h
@@ -5,15 +5,13 @@
 #ifndef CHROME_COMMON_CHILD_PROCESS_HOST_H_
 #define CHROME_COMMON_CHILD_PROCESS_HOST_H_
 
-#include "build/build_config.h"
-
 #include <list>
+#include <string>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/waitable_event_watcher.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/common/child_process_info.h"
 #include "chrome/common/ipc_channel.h"
 
 class NotificationType;
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index 66fcc09..f70869a 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -5,6 +5,8 @@
 #ifndef CHROME_COMMON_CHILD_THREAD_H_
 #define CHROME_COMMON_CHILD_THREAD_H_
 
+#include "base/basictypes.h"
+#include "base/scoped_ptr.h"
 #include "base/thread.h"
 #include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/message_router.h"
@@ -85,7 +87,7 @@ class ChildThread : public IPC::Channel::Listener,
   // that would addref it.
   bool check_with_browser_before_shutdown_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(ChildThread);
+  DISALLOW_COPY_AND_ASSIGN(ChildThread);
 };
 
 #endif  // CHROME_COMMON_CHILD_THREAD_H_
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index e099a7e..a92191c 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -7,18 +7,15 @@
 
 #include <string>
 #include <vector>
-#include <map>
 
 #include "base/file_path.h"
 #include "base/scoped_ptr.h"
-#include "base/string16.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/common/extensions/user_script.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/page_action.h"
 #include "googleurl/src/gurl.h"
-#include "third_party/skia/include/core/SkColor.h"
 
 // Represents a Chromium extension.
 class Extension {
diff --git a/chrome/common/extensions/extension_error_reporter.cc b/chrome/common/extensions/extension_error_reporter.cc
index efc0aa0..442ed79 100644
--- a/chrome/common/extensions/extension_error_reporter.cc
+++ b/chrome/common/extensions/extension_error_reporter.cc
@@ -4,9 +4,13 @@
 
 #include "chrome/common/extensions/extension_error_reporter.h"
 
+#include "build/build_config.h"
+
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #endif
+#include "base/logging.h"
+#include "base/message_loop.h"
 #include "base/string_util.h"
 
 // No AddRef required when using ExtensionErrorReporter with RunnableMethod.
diff --git a/chrome/common/extensions/extension_error_reporter.h b/chrome/common/extensions/extension_error_reporter.h
index 347f7d6..aa17205 100644
--- a/chrome/common/extensions/extension_error_reporter.h
+++ b/chrome/common/extensions/extension_error_reporter.h
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "base/message_loop.h"
+class MessageLoop;
 
 // Exposes an easy way for the various components of the extension system to
 // report errors. This is a singleton that lives on the UI thread, with the
diff --git a/chrome/common/ipc_channel_proxy.h b/chrome/common/ipc_channel_proxy.h
index 3773cd0..67a3c17 100644
--- a/chrome/common/ipc_channel_proxy.h
+++ b/chrome/common/ipc_channel_proxy.h
@@ -6,7 +6,7 @@
 #define CHROME_COMMON_IPC_CHANNEL_PROXY_H__
 
 #include <vector>
-#include "base/lock.h"
+
 #include "base/ref_counted.h"
 #include "chrome/common/ipc_channel.h"
 
diff --git a/chrome/common/ipc_logging.h b/chrome/common/ipc_logging.h
index cfdcf21..e16b9d4 100644
--- a/chrome/common/ipc_logging.h
+++ b/chrome/common/ipc_logging.h
@@ -9,13 +9,12 @@
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
 
-#include "base/lock.h"
+#include <vector>
+
 #include "base/message_loop.h"
+#include "base/scoped_ptr.h"
 #include "base/singleton.h"
 #include "base/waitable_event_watcher.h"
-#include "chrome/common/ipc_message_utils.h"
-
-class MessageLoop;
 
 namespace IPC {
 
diff --git a/chrome/common/ipc_sync_channel.h b/chrome/common/ipc_sync_channel.h
index 1b192f6..2208a67 100644
--- a/chrome/common/ipc_sync_channel.h
+++ b/chrome/common/ipc_sync_channel.h
@@ -7,14 +7,17 @@
 
 #include <string>
 #include <deque>
+
 #include "base/basictypes.h"
 #include "base/lock.h"
 #include "base/ref_counted.h"
-#include "base/scoped_handle.h"
-#include "base/waitable_event.h"
 #include "base/waitable_event_watcher.h"
 #include "chrome/common/ipc_channel_proxy.h"
 
+namespace base {
+class WaitableEvent;
+};
+
 namespace IPC {
 
 class SyncMessage;
diff --git a/chrome/common/jstemplate_builder.h b/chrome/common/jstemplate_builder.h
index 4bc619b..6d3d8d0 100644
--- a/chrome/common/jstemplate_builder.h
+++ b/chrome/common/jstemplate_builder.h
@@ -15,8 +15,7 @@
 
 #include <string>
 
-#include "base/values.h"
-
+class DictionaryValue;
 class StringPiece;
 
 namespace jstemplate_builder {
diff --git a/chrome/common/mru_cache.h b/chrome/common/mru_cache.h
index 6d7426a..7090aaf 100644
--- a/chrome/common/mru_cache.h
+++ b/chrome/common/mru_cache.h
@@ -21,7 +21,7 @@
 #include <utility>
 
 #include "base/basictypes.h"
-#include "chrome/common/logging_chrome.h"
+#include "base/logging.h"
 
 // MRUCacheBase ----------------------------------------------------------------
 
diff --git a/chrome/common/net/cookie_monster_sqlite.h b/chrome/common/net/cookie_monster_sqlite.h
index dac5b26..4235ffe 100644
--- a/chrome/common/net/cookie_monster_sqlite.h
+++ b/chrome/common/net/cookie_monster_sqlite.h
@@ -11,12 +11,13 @@
 #include <vector>
 
 #include "base/ref_counted.h"
-#include "base/message_loop.h"
 #include "chrome/browser/meta_table_helper.h"
 #include "net/base/cookie_monster.h"
 
 struct sqlite3;
 
+class MessageLoop;
+
 class SQLitePersistentCookieStore
     : public net::CookieMonster::PersistentCookieStore {
  public:
diff --git a/chrome/common/net/url_request_intercept_job.h b/chrome/common/net/url_request_intercept_job.h
index ba6bbe2..73f354d 100644
--- a/chrome/common/net/url_request_intercept_job.h
+++ b/chrome/common/net/url_request_intercept_job.h
@@ -9,7 +9,6 @@
 
 #include "base/scoped_ptr.h"
 #include "net/url_request/url_request_job.h"
-#include "chrome/browser/chrome_plugin_host.h"
 #include "chrome/common/chrome_plugin_api.h"
 #include "chrome/common/chrome_plugin_util.h"
 #include "chrome/common/notification_registrar.h"
diff --git a/chrome/common/page_action.h b/chrome/common/page_action.h
index 69bd238..c0b7325 100644
--- a/chrome/common/page_action.h
+++ b/chrome/common/page_action.h
@@ -9,7 +9,6 @@
 #include <map>
 
 #include "base/file_path.h"
-#include "googleurl/src/gurl.h"
 
 class PageAction {
  public:
diff --git a/chrome/common/resource_dispatcher.h b/chrome/common/resource_dispatcher.h
index 0996445..f1933bc 100644
--- a/chrome/common/resource_dispatcher.h
+++ b/chrome/common/resource_dispatcher.h
@@ -8,7 +8,6 @@
 #define CHROME_COMMON_RESOURCE_DISPATCHER_H__
 
 #include <deque>
-#include <queue>
 #include <string>
 
 #include "base/hash_tables.h"
diff --git a/chrome/common/sqlite_compiled_statement.cc b/chrome/common/sqlite_compiled_statement.cc
index cdcb8a3..9449818 100644
--- a/chrome/common/sqlite_compiled_statement.cc
+++ b/chrome/common/sqlite_compiled_statement.cc
@@ -6,6 +6,8 @@
 
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
+#include "chrome/common/sqlite_utils.h"
+#include "third_party/sqlite/preprocessed/sqlite3.h"
 
 // SqliteStatementCache -------------------------------------------------------
 
diff --git a/chrome/common/sqlite_compiled_statement.h b/chrome/common/sqlite_compiled_statement.h
index c9f198f..43baf9c 100644
--- a/chrome/common/sqlite_compiled_statement.h
+++ b/chrome/common/sqlite_compiled_statement.h
@@ -8,9 +8,10 @@
 #include <map>
 #include <string>
 
-#include "chrome/common/sqlite_utils.h"
+#include "base/basictypes.h"
 
-#include "third_party/sqlite/preprocessed/sqlite3.h"
+struct sqlite3;
+class SQLStatement;
 
 // Stores a list of precompiled sql statements for a database. Each statement
 // is given a unique name by the caller.
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 662e166..3b692ac1 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -12,13 +12,11 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/string16.h"
 #include "base/gfx/native_widget_types.h"
 #include "build/build_config.h"
-#include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "googleurl/src/gurl.h"