Move ResourceResponse struct into the Content API, since it's used in Chrome. While at it, I also made the ResourceResponse wrapper just derive from ResourceResponseHead, so that the parameters are accessed directly, instead of having to go through a member variable.

BUG=98716
Review URL: http://codereview.chromium.org/8680036

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

1 files changed, 4 insertions, 4 deletions

diff --git a/content/browser/renderer_host/sync_resource_handler.h b/content/browser/renderer_host/sync_resource_handler.h
index 0a1ee21..5786c6a 100644
--- a/content/browser/renderer_host/sync_resource_handler.h
+++ b/content/browser/renderer_host/sync_resource_handler.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "content/browser/renderer_host/resource_handler.h"
-#include "content/common/resource_response.h"
+#include "content/public/common/resource_response.h"
 
 class ResourceDispatcherHost;
 class ResourceMessageFilter;
@@ -36,10 +36,10 @@ class SyncResourceHandler : public ResourceHandler {
                                 uint64 size) OVERRIDE;
   virtual bool OnRequestRedirected(int request_id,
                                    const GURL& new_url,
-                                   ResourceResponse* response,
+                                   content::ResourceResponse* response,
                                    bool* defer) OVERRIDE;
   virtual bool OnResponseStarted(int request_id,
-                                 ResourceResponse* response) OVERRIDE;
+                                 content::ResourceResponse* response) OVERRIDE;
   virtual bool OnWillStart(int request_id,
                            const GURL& url,
                            bool* defer) OVERRIDE;
@@ -61,7 +61,7 @@ class SyncResourceHandler : public ResourceHandler {
 
   scoped_refptr<net::IOBuffer> read_buffer_;
 
-  SyncLoadResult result_;
+  content::SyncLoadResult result_;
   ResourceMessageFilter* filter_;
   IPC::Message* result_message_;
   ResourceDispatcherHost* rdh_;