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

2 files changed, 11 insertions, 7 deletions

diff --git a/content/browser/debugger/devtools_netlog_observer.cc b/content/browser/debugger/devtools_netlog_observer.cc
index 023ced3..98492b2 100644
--- a/content/browser/debugger/devtools_netlog_observer.cc
+++ b/content/browser/debugger/devtools_netlog_observer.cc
@@ -7,9 +7,9 @@
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "content/common/resource_response.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/common/resource_response.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_net_log_params.h"
 #include "net/http/http_response_headers.h"
@@ -260,8 +260,9 @@ DevToolsNetLogObserver* DevToolsNetLogObserver::GetInstance() {
 }
 
 // static
-void DevToolsNetLogObserver::PopulateResponseInfo(net::URLRequest* request,
-                                                  ResourceResponse* response) {
+void DevToolsNetLogObserver::PopulateResponseInfo(
+    net::URLRequest* request,
+    content::ResourceResponse* response) {
   if (!(request->load_flags() & net::LOAD_REPORT_RAW_HEADERS))
     return;
 
@@ -270,7 +271,7 @@ void DevToolsNetLogObserver::PopulateResponseInfo(net::URLRequest* request,
       DevToolsNetLogObserver::GetInstance();
   if (dev_tools_net_log_observer == NULL)
     return;
-  response->response_head.devtools_info =
+  response->devtools_info =
       dev_tools_net_log_observer->GetResourceInfo(source_id);
 }
 
diff --git a/content/browser/debugger/devtools_netlog_observer.h b/content/browser/debugger/devtools_netlog_observer.h
index 3fe2765..0a92dc1 100644
--- a/content/browser/debugger/devtools_netlog_observer.h
+++ b/content/browser/debugger/devtools_netlog_observer.h
@@ -11,12 +11,14 @@
 #include "net/base/net_log.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
+namespace content {
+struct ResourceResponse;
+}
+
 namespace net {
 class URLRequest;
 }  // namespace net
 
-struct ResourceResponse;
-
 // DevToolsNetLogObserver watches the NetLog event stream and collects the
 // stuff that may be of interest to DevTools. Currently, this only includes
 // actual HTTP/SPDY headers sent and received over the network.
@@ -59,7 +61,8 @@ class DevToolsNetLogObserver : public net::NetLog::ThreadSafeObserver {
   // Must be called on the IO thread. May return NULL if no observers
   // are active.
   static DevToolsNetLogObserver* GetInstance();
-  static void PopulateResponseInfo(net::URLRequest*, ResourceResponse*);
+  static void PopulateResponseInfo(net::URLRequest*,
+                                   content::ResourceResponse*);
   static int GetAndResetEncodedDataLength(net::URLRequest* request);
 
  private: