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

11 files changed, 17 insertions, 13 deletions

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: