FBTF: Header cleanup in renderer_host.

BUG=none
TEST=none

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

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

24 files changed, 65 insertions, 31 deletions

diff --git a/chrome/browser/renderer_host/backing_store.h b/chrome/browser/renderer_host/backing_store.h
index 699b59b..53d0288 100644
--- a/chrome/browser/renderer_host/backing_store.h
+++ b/chrome/browser/renderer_host/backing_store.h
@@ -10,8 +10,6 @@
 
 #include "app/surface/transport_dib.h"
 #include "base/basictypes.h"
-#include "base/process.h"
-#include "gfx/rect.h"
 #include "gfx/size.h"
 
 class RenderProcessHost;
diff --git a/chrome/browser/renderer_host/backing_store_mac.mm b/chrome/browser/renderer_host/backing_store_mac.mm
index 89ccc17..f793395 100644
--- a/chrome/browser/renderer_host/backing_store_mac.mm
+++ b/chrome/browser/renderer_host/backing_store_mac.mm
@@ -13,6 +13,7 @@
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
+#include "gfx/rect.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/chrome/browser/renderer_host/browser_render_process_host.h b/chrome/browser/renderer_host/browser_render_process_host.h
index c72f4d7..5f20f0e 100644
--- a/chrome/browser/renderer_host/browser_render_process_host.h
+++ b/chrome/browser/renderer_host/browser_render_process_host.h
@@ -18,6 +18,7 @@
 #include "base/timer.h"
 #include "chrome/browser/child_process_launcher.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index fcdc75f..26e7217 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -29,6 +29,7 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/common/bindings_policy.h"
+#include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
@@ -48,6 +49,7 @@
 #include "webkit/glue/form_data.h"
 #include "webkit/glue/form_field.h"
 #include "webkit/glue/password_form_dom_manager.h"
+#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webdropdata.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h
index 736c08f..7196756 100644
--- a/chrome/browser/renderer_host/render_view_host.h
+++ b/chrome/browser/renderer_host/render_view_host.h
@@ -22,7 +22,6 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebDragOperation.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
-#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class FilePath;
@@ -53,6 +52,7 @@ struct FormData;
 class FormField;
 struct PasswordForm;
 struct PasswordFormFillData;
+struct WebAccessibility;
 struct WebApplicationInfo;
 }  // namespace webkit_glue
 
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 53427ef..774b682 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -18,8 +18,11 @@
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/video_layer.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebCompositionUnderline.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webcursor.h"
 
 #if defined(TOOLKIT_VIEWS)
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index 2f31158..355aefa 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -12,7 +12,6 @@
 
 #include "app/surface/transport_dib.h"
 #include "base/gtest_prod_util.h"
-#include "base/process.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/timer.h"
@@ -22,8 +21,7 @@
 #include "gfx/native_widget_types.h"
 #include "gfx/size.h"
 #include "ipc/ipc_channel.h"
-#include "ipc/ipc_channel_handle.h"
-#include "third_party/WebKit/WebKit/chromium/public/WebCompositionUnderline.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextInputType.h"
 
@@ -34,7 +32,7 @@ class Rect;
 namespace WebKit {
 class WebInputEvent;
 class WebMouseEvent;
-class WebMouseWheelEvent;
+struct WebCompositionUnderline;
 struct WebScreenInfo;
 }
 
@@ -292,9 +290,9 @@ class RenderWidgetHost : public IPC::Channel::Listener,
   //     NotifyTextDirection();
   //   }
   // 2. Change the text direction when pressing a set of keys.
-  // Becauses of auto-repeat, we may receive the same key-press event many
+  // Because of auto-repeat, we may receive the same key-press event many
   // times while we presses the keys and it is nonsense to send the same IPC
-  // messsage every time when we receive a key-press event.
+  // message every time when we receive a key-press event.
   // To suppress the number of IPC messages, we just update the text direction
   // when receiving a key-press event and send an IPC message when we release
   // the keys as listed in the following snippet.
@@ -399,7 +397,7 @@ class RenderWidgetHost : public IPC::Channel::Listener,
 
  protected:
   // Aid for determining when an accessibility tree request can be made. Set by
-  // TabContents to true on document load and to false on page nativigation.
+  // TabContents to true on document load and to false on page navigation.
   void SetDocumentLoaded(bool document_loaded);
 
   // Requests a snapshot of an accessible DOM tree from the renderer.
@@ -642,7 +640,7 @@ class RenderWidgetHost : public IPC::Channel::Listener,
   // Optional observer that listens for notifications of painting.
   scoped_ptr<PaintObserver> paint_observer_;
 
-  // Flag to detect recurive calls to GetBackingStore().
+  // Flag to detect recursive calls to GetBackingStore().
   bool in_get_backing_store_;
 
   // Set when we call DidPaintRect/DidScrollRect on the view.
@@ -676,7 +674,7 @@ class RenderWidgetHost : public IPC::Channel::Listener,
   // System may translate a RawKeyDown event into zero or more Char events,
   // usually we send them to the renderer directly in sequence. However, If a
   // RawKeyDown event was not handled by the renderer but was handled by
-  // our UnhandledKeyboardEvent() method, eg. as an accelerator key, then we
+  // our UnhandledKeyboardEvent() method, e.g. as an accelerator key, then we
   // shall not send the following sequence of Char events, which was generated
   // by this RawKeyDown event, to the renderer. Otherwise the renderer may
   // handle the Char events and cause unexpected behavior.
diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h
index dfbadde..45192ee 100644
--- a/chrome/browser/renderer_host/render_widget_host_view.h
+++ b/chrome/browser/renderer_host/render_widget_host_view.h
@@ -11,13 +11,10 @@
 #endif
 
 #include "app/surface/transport_dib.h"
-#include "base/shared_memory.h"
 #include "gfx/native_widget_types.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextInputType.h"
-#include "webkit/glue/plugins/webplugin.h"
-#include "webkit/glue/webaccessibility.h"
 
 namespace gfx {
 class Rect;
@@ -34,6 +31,11 @@ class VideoLayer;
 class WebCursor;
 struct WebMenuItem;
 
+namespace webkit_glue {
+struct WebAccessibility;
+struct WebPluginGeometry;
+}
+
 // RenderWidgetHostView is an interface implemented by an object that acts as
 // the "View" portion of a RenderWidgetHost. The RenderWidgetHost and its
 // associated RenderProcessHost own the "Model" in this case which is the
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 1b9032b..315dd16 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -38,6 +38,8 @@
 #include "chrome/common/native_web_keyboard_event.h"
 #include "gfx/gtk_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/gtk/WebInputEventFactory.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor_gtk_data.h"
 
 #if defined(OS_CHROMEOS)
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index 9d79113..df18258 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -16,6 +16,7 @@
 #include "chrome/browser/gtk/owned_widget_gtk.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "gfx/native_widget_types.h"
+#include "gfx/rect.h"
 #include "webkit/glue/plugins/gtk_plugin_container_manager.h"
 #include "webkit/glue/webcursor.h"
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
index e4ad82c..9236bbe 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -33,6 +33,8 @@
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/WebKit/WebKit/chromium/public/mac/WebInputEventFactory.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webmenurunner_mac.h"
 
 using WebKit::WebInputEvent;
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index 751c2be..b25d83d 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -45,6 +45,8 @@
 #include "views/widget/widget_win.h"
 #include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webcursor.h"
 
 using base::TimeDelta;
diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
index 20179f4..1878177 100644
--- a/chrome/browser/renderer_host/resource_dispatcher_host.h
+++ b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -4,7 +4,7 @@
 
 // This is the browser side of the resource dispatcher, it receives requests
 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
-// dispatches them to URLRequests. It then fowards the messages from the
+// dispatches them to URLRequests. It then forwards the messages from the
 // URLRequests back to the correct process for handling.
 //
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc
index 12c8021..70e75d4 100644
--- a/chrome/browser/renderer_host/resource_message_filter.cc
+++ b/chrome/browser/renderer_host/resource_message_filter.cc
@@ -91,6 +91,7 @@
 #include "webkit/glue/webcookie.h"
 #include "webkit/glue/webkit_glue.h"
 
+using net::CookieStore;
 using WebKit::WebCache;
 
 namespace {
@@ -1680,3 +1681,7 @@ void GetCookiesCompletion::RunWithParams(const Tuple1<int>& params) {
     delete this;
   }
 }
+
+void GetCookiesCompletion::set_cookie_store(CookieStore* cookie_store) {
+  cookie_store_ = cookie_store;
+}
diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
index 19320e0..04b1728 100644
--- a/chrome/browser/renderer_host/resource_message_filter.h
+++ b/chrome/browser/renderer_host/resource_message_filter.h
@@ -24,10 +24,8 @@
 #include "build/build_config.h"
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "chrome/common/window_container_type.h"
 #include "gfx/native_widget_types.h"
 #include "ipc/ipc_channel_proxy.h"
-#include "net/base/cookie_store.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPopupType.h"
 
@@ -61,6 +59,10 @@ namespace file_util {
 struct FileInfo;
 }
 
+namespace net {
+class CookieStore;
+}
+
 namespace printing {
 class PrinterQuery;
 class PrintJobManager;
@@ -510,9 +512,7 @@ class GetCookiesCompletion : public net::CompletionCallback {
     return render_view_id_;
   }
 
-  void set_cookie_store(net::CookieStore* cookie_store) {
-    cookie_store_ = cookie_store;
-  }
+  void set_cookie_store(net::CookieStore* cookie_store);
 
   net::CookieStore* cookie_store() {
     return cookie_store_.get();
diff --git a/chrome/browser/renderer_host/site_instance.h b/chrome/browser/renderer_host/site_instance.h
index 171a699..df7f69c 100644
--- a/chrome/browser/renderer_host/site_instance.h
+++ b/chrome/browser/renderer_host/site_instance.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "chrome/browser/renderer_host/render_process_host.h"
+#include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/chrome/browser/renderer_host/socket_stream_host.h b/chrome/browser/renderer_host/socket_stream_host.h
index ac1e073..48a8e1b 100644
--- a/chrome/browser/renderer_host/socket_stream_host.h
+++ b/chrome/browser/renderer_host/socket_stream_host.h
@@ -10,10 +10,14 @@
 
 #include "base/ref_counted.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
-#include "net/socket_stream/socket_stream_job.h"
+#include "net/socket_stream/socket_stream.h"
 
 class GURL;
 
+namespace net {
+class SocketStreamJob;
+}
+
 // Host of SocketStreamHandle.
 // Each SocketStreamHandle will have an unique socket_id assigned by
 // SocketStreamHost constructor. If socket id is chrome_common_net::kNoSocketId,
diff --git a/chrome/browser/renderer_host/sync_resource_handler.cc b/chrome/browser/renderer_host/sync_resource_handler.cc
index 18d8c6b..86bc899 100644
--- a/chrome/browser/renderer_host/sync_resource_handler.cc
+++ b/chrome/browser/renderer_host/sync_resource_handler.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
+#include "net/base/io_buffer.h"
 #include "net/http/http_response_headers.h"
 
 SyncResourceHandler::SyncResourceHandler(
diff --git a/chrome/browser/renderer_host/sync_resource_handler.h b/chrome/browser/renderer_host/sync_resource_handler.h
index 9611f0b..c43fd27 100644
--- a/chrome/browser/renderer_host/sync_resource_handler.h
+++ b/chrome/browser/renderer_host/sync_resource_handler.h
@@ -11,7 +11,10 @@
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_handler.h"
 #include "chrome/common/resource_response.h"
-#include "net/base/io_buffer.h"
+
+namespace net {
+class IOBuffer;
+}
 
 // Used to complete a synchronous resource request in response to resource load
 // events from the resource dispatcher host.
diff --git a/chrome/browser/renderer_host/video_layer.h b/chrome/browser/renderer_host/video_layer.h
index a6907ce..0d7d4f8 100644
--- a/chrome/browser/renderer_host/video_layer.h
+++ b/chrome/browser/renderer_host/video_layer.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "app/surface/transport_dib.h"
-#include "base/scoped_ptr.h"
 #include "gfx/size.h"
 
 class RenderProcessHost;
diff --git a/chrome/browser/renderer_host/video_layer_x.h b/chrome/browser/renderer_host/video_layer_x.h
index 5225d4e..a12c7b4 100644
--- a/chrome/browser/renderer_host/video_layer_x.h
+++ b/chrome/browser/renderer_host/video_layer_x.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "app/x11_util.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/video_layer.h"
 #include "gfx/rect.h"
 
diff --git a/chrome/browser/renderer_host/web_cache_manager.h b/chrome/browser/renderer_host/web_cache_manager.h
index d1a1e26..1c53a76 100644
--- a/chrome/browser/renderer_host/web_cache_manager.h
+++ b/chrome/browser/renderer_host/web_cache_manager.h
@@ -15,7 +15,6 @@
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
-#include "base/shared_memory.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
@@ -122,7 +121,7 @@ class WebCacheManager {
     // Allow each renderer to keep its current set of cached resources.
     KEEP_CURRENT,
 
-    // Allow each renderer to keep cache resources it believs are currently
+    // Allow each renderer to keep cache resources it believes are currently
     // being used, with some extra allocation to store new objects.
     KEEP_LIVE_WITH_HEADROOM,
 
diff --git a/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc b/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc
index 40bde4d..16ef18e 100644
--- a/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc
+++ b/chrome/browser/renderer_host/x509_user_cert_resource_handler.cc
@@ -7,7 +7,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/download/download_file.h"
+#include "chrome/browser/download/download_types.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "chrome/browser/ssl/ssl_add_cert_handler.h"
@@ -17,6 +17,8 @@
 #include "net/base/mime_sniffer.h"
 #include "net/base/mime_util.h"
 #include "net/http/http_response_headers.h"
+#include "net/url_request/url_request.h"
+#include "net/url_request/url_request_status.h"
 
 X509UserCertResourceHandler::X509UserCertResourceHandler(
     ResourceDispatcherHost* host, URLRequest* request,
@@ -112,6 +114,9 @@ bool X509UserCertResourceHandler::OnResponseCompleted(
 void X509UserCertResourceHandler::OnRequestClosed() {
 }
 
+X509UserCertResourceHandler::~X509UserCertResourceHandler() {
+}
+
 void X509UserCertResourceHandler::AssembleResource() {
   size_t bytes_copied = 0;
   resource_buffer_ = new net::IOBuffer(content_length_);
diff --git a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h b/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
index cedb0f0..ba6afb4 100644
--- a/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
+++ b/chrome/browser/renderer_host/x509_user_cert_resource_handler.h
@@ -8,9 +8,14 @@
 
 #include <string>
 
-#include "chrome/browser/renderer_host/resource_dispatcher_host.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/renderer_host/resource_handler.h"
-#include "chrome/browser/download/download_file.h"
+#include "googleurl/src/gurl.h"
+
+class ResourceDispatcherHost;
+class URLRequest;
+class URLRequestStatus;
+struct DownloadBuffer;
 
 // This class handles the "application/x-x509-user-cert" mime-type
 // which is a certificate generated by a CA after a previous
@@ -48,9 +53,8 @@ class X509UserCertResourceHandler : public ResourceHandler {
 
   void OnRequestClosed();
 
-
  private:
-  ~X509UserCertResourceHandler() {}
+  ~X509UserCertResourceHandler();
 
   void AssembleResource();