Move resource_response_info from webkit/ to content/

BUG=338338
TBR=darin@chromium.org

Review URL: https://codereview.chromium.org/293353007

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

22 files changed, 81 insertions, 94 deletions

diff --git a/chrome/renderer/extensions/extension_localization_peer.cc b/chrome/renderer/extensions/extension_localization_peer.cc
index 073a1ca..7373995a 100644
--- a/chrome/renderer/extensions/extension_localization_peer.cc
+++ b/chrome/renderer/extensions/extension_localization_peer.cc
@@ -49,13 +49,13 @@ void ExtensionLocalizationPeer::OnUploadProgress(
 bool ExtensionLocalizationPeer::OnReceivedRedirect(
     const GURL& new_url,
     const GURL& new_first_party_for_cookies,
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   NOTREACHED();
   return false;
 }
 
 void ExtensionLocalizationPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   response_info_ = info;
 }
 
diff --git a/chrome/renderer/extensions/extension_localization_peer.h b/chrome/renderer/extensions/extension_localization_peer.h
index 329b11f..4d6c056 100644
--- a/chrome/renderer/extensions/extension_localization_peer.h
+++ b/chrome/renderer/extensions/extension_localization_peer.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "content/public/child/request_peer.h"
-#include "webkit/common/resource_response_info.h"
+#include "content/public/common/resource_response_info.h"
 
 namespace IPC {
 class Sender;
@@ -36,9 +36,9 @@ class ExtensionLocalizationPeer : public content::RequestPeer {
   virtual bool OnReceivedRedirect(
       const GURL& new_url,
       const GURL& new_first_party_for_cookies,
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
+      const content::ResourceResponseInfo& info) OVERRIDE;
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
+      const content::ResourceResponseInfo& info) OVERRIDE;
   virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {}
   virtual void OnReceivedData(const char* data,
                               int data_length,
@@ -66,7 +66,7 @@ class ExtensionLocalizationPeer : public content::RequestPeer {
   content::RequestPeer* original_peer_;
 
   // We just pass though the response info. This holds the copy of the original.
-  webkit_glue::ResourceResponseInfo response_info_;
+  content::ResourceResponseInfo response_info_;
 
   // Sends ExtensionHostMsg_GetMessageBundle message to the browser to fetch
   // message catalog.
diff --git a/chrome/renderer/extensions/extension_localization_peer_unittest.cc b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
index d31502c..94e43b7 100644
--- a/chrome/renderer/extensions/extension_localization_peer_unittest.cc
+++ b/chrome/renderer/extensions/extension_localization_peer_unittest.cc
@@ -58,9 +58,9 @@ class MockResourceLoaderBridgePeer : public content::RequestPeer {
   MOCK_METHOD3(OnReceivedRedirect,
                bool(const GURL& new_url,
                     const GURL& new_first_party_for_cookies,
-                    const webkit_glue::ResourceResponseInfo& info));
-  MOCK_METHOD1(OnReceivedResponse, void(
-      const webkit_glue::ResourceResponseInfo& info));
+                    const content::ResourceResponseInfo& info));
+  MOCK_METHOD1(OnReceivedResponse,
+               void(const content::ResourceResponseInfo& info));
   MOCK_METHOD2(OnDownloadedData, void(int len, int encoded_data_length));
   MOCK_METHOD3(OnReceivedData, void(const char* data,
                                     int data_length,
diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc
index 24be8f9..c43b451 100644
--- a/chrome/renderer/security_filter_peer.cc
+++ b/chrome/renderer/security_filter_peer.cc
@@ -71,13 +71,13 @@ void SecurityFilterPeer::OnUploadProgress(uint64 position, uint64 size) {
 bool SecurityFilterPeer::OnReceivedRedirect(
     const GURL& new_url,
     const GURL& new_first_party_for_cookies,
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   NOTREACHED();
   return false;
 }
 
 void SecurityFilterPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   NOTREACHED();
 }
 
@@ -98,10 +98,9 @@ void SecurityFilterPeer::OnCompletedRequest(
 }
 
 // static
-void ProcessResponseInfo(
-    const webkit_glue::ResourceResponseInfo& info_in,
-    webkit_glue::ResourceResponseInfo* info_out,
-    const std::string& mime_type) {
+void ProcessResponseInfo(const content::ResourceResponseInfo& info_in,
+                         content::ResourceResponseInfo* info_out,
+                         const std::string& mime_type) {
   DCHECK(info_out);
   *info_out = info_in;
   info_out->mime_type = mime_type;
@@ -137,7 +136,7 @@ BufferedPeer::~BufferedPeer() {
 }
 
 void BufferedPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   ProcessResponseInfo(info, &response_info_, mime_type_);
 }
 
@@ -191,7 +190,7 @@ ReplaceContentPeer::~ReplaceContentPeer() {
 }
 
 void ReplaceContentPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
@@ -208,7 +207,7 @@ void ReplaceContentPeer::OnCompletedRequest(
     const std::string& security_info,
     const base::TimeTicks& completion_time,
     int64 total_transfer_size) {
-  webkit_glue::ResourceResponseInfo info;
+  content::ResourceResponseInfo info;
   ProcessResponseInfo(info, &info, mime_type_);
   info.security_info = security_info;
   info.content_length = static_cast<int>(data_.size());
diff --git a/chrome/renderer/security_filter_peer.h b/chrome/renderer/security_filter_peer.h
index ca96c1d..6f729b7 100644
--- a/chrome/renderer/security_filter_peer.h
+++ b/chrome/renderer/security_filter_peer.h
@@ -6,7 +6,7 @@
 #define CHROME_RENDERER_SECURITY_FILTER_PEER_H_
 
 #include "content/public/child/request_peer.h"
-#include "webkit/common/resource_response_info.h"
+#include "content/public/common/resource_response_info.h"
 #include "webkit/common/resource_type.h"
 
 // The SecurityFilterPeer is a proxy to a
@@ -34,9 +34,9 @@ class SecurityFilterPeer : public content::RequestPeer {
   virtual bool OnReceivedRedirect(
       const GURL& new_url,
       const GURL& new_first_party_for_cookies,
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
+      const content::ResourceResponseInfo& info) OVERRIDE;
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
+      const content::ResourceResponseInfo& info) OVERRIDE;
   virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE {}
   virtual void OnReceivedData(const char* data,
                               int data_length,
@@ -66,7 +66,7 @@ class BufferedPeer : public SecurityFilterPeer {
 
   // content::RequestPeer Implementation.
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
+      const content::ResourceResponseInfo& info) OVERRIDE;
   virtual void OnReceivedData(const char* data,
                               int data_length,
                               int encoded_data_length) OVERRIDE;
@@ -85,7 +85,7 @@ class BufferedPeer : public SecurityFilterPeer {
   // original peer, if it returns false, an error is sent instead.
   virtual bool DataReady() = 0;
 
-  webkit_glue::ResourceResponseInfo response_info_;
+  content::ResourceResponseInfo response_info_;
   std::string data_;
 
  private:
@@ -109,7 +109,7 @@ class ReplaceContentPeer : public SecurityFilterPeer {
 
   // content::RequestPeer Implementation.
   virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
+      const content::ResourceResponseInfo& info) OVERRIDE;
   virtual void OnReceivedData(const char* data,
                               int data_length,
                               int encoded_data_length) OVERRIDE;
@@ -122,7 +122,7 @@ class ReplaceContentPeer : public SecurityFilterPeer {
       int64 total_transfer_size) OVERRIDE;
 
  private:
-  webkit_glue::ResourceResponseInfo response_info_;
+  content::ResourceResponseInfo response_info_;
   std::string mime_type_;
   std::string data_;
 
diff --git a/content/child/npapi/plugin_url_fetcher.cc b/content/child/npapi/plugin_url_fetcher.cc
index f8f38b6..d596b96 100644
--- a/content/child/npapi/plugin_url_fetcher.cc
+++ b/content/child/npapi/plugin_url_fetcher.cc
@@ -18,6 +18,7 @@
 #include "content/child/web_url_loader_impl.h"
 #include "content/common/resource_request_body.h"
 #include "content/common/service_worker/service_worker_types.h"
+#include "content/public/common/resource_response_info.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
@@ -25,7 +26,6 @@
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "webkit/child/multipart_response_delegate.h"
 #include "webkit/child/resource_loader_bridge.h"
-#include "webkit/common/resource_response_info.h"
 
 namespace content {
 namespace {
@@ -191,7 +191,7 @@ void PluginURLFetcher::OnUploadProgress(uint64 position, uint64 size) {
 bool PluginURLFetcher::OnReceivedRedirect(
     const GURL& new_url,
     const GURL& new_first_party_for_cookies,
-    const webkit_glue::ResourceResponseInfo& info) {
+    const ResourceResponseInfo& info) {
   if (!plugin_stream_)
     return false;
 
@@ -236,8 +236,7 @@ bool PluginURLFetcher::OnReceivedRedirect(
   return true;
 }
 
-void PluginURLFetcher::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+void PluginURLFetcher::OnReceivedResponse(const ResourceResponseInfo& info) {
   if (!plugin_stream_)
     return;
 
diff --git a/content/child/npapi/plugin_url_fetcher.h b/content/child/npapi/plugin_url_fetcher.h
index 9527d64..7eab78e 100644
--- a/content/child/npapi/plugin_url_fetcher.h
+++ b/content/child/npapi/plugin_url_fetcher.h
@@ -56,12 +56,10 @@ class PluginURLFetcher : public RequestPeer {
  private:
   // RequestPeer implementation:
   virtual void OnUploadProgress(uint64 position, uint64 size) OVERRIDE;
-  virtual bool OnReceivedRedirect(
-      const GURL& new_url,
-      const GURL& new_first_party_for_cookies,
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
-  virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info) OVERRIDE;
+  virtual bool OnReceivedRedirect(const GURL& new_url,
+                                  const GURL& new_first_party_for_cookies,
+                                  const ResourceResponseInfo& info) OVERRIDE;
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info) OVERRIDE;
   virtual void OnDownloadedData(int len, int encoded_data_length) OVERRIDE;
   virtual void OnReceivedData(const char* data,
                               int data_length,
diff --git a/content/child/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
index 456695c..d291f88 100644
--- a/content/child/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc
@@ -32,7 +32,6 @@
 #include "webkit/common/resource_type.h"
 
 using webkit_glue::ResourceLoaderBridge;
-using webkit_glue::ResourceResponseInfo;
 
 namespace content {
 
diff --git a/content/child/resource_dispatcher.h b/content/child/resource_dispatcher.h
index 73c82ab..2e4b54e 100644
--- a/content/child/resource_dispatcher.h
+++ b/content/child/resource_dispatcher.h
@@ -25,12 +25,12 @@ struct ResourceMsg_RequestCompleteData;
 
 namespace webkit_glue {
 class ResourceLoaderBridge;
-struct ResourceResponseInfo;
 }
 
 namespace content {
 class RequestPeer;
 class ResourceDispatcherDelegate;
+struct ResourceResponseInfo;
 struct RequestInfo;
 struct ResourceResponseHead;
 struct SiteIsolationResponseMetaData;
@@ -166,10 +166,9 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
   // again in the deferred state.
   void FlushDeferredMessages(int request_id);
 
-  void ToResourceResponseInfo(
-      const PendingRequestInfo& request_info,
-      const ResourceResponseHead& browser_info,
-      webkit_glue::ResourceResponseInfo* renderer_info) const;
+  void ToResourceResponseInfo(const PendingRequestInfo& request_info,
+                              const ResourceResponseHead& browser_info,
+                              ResourceResponseInfo* renderer_info) const;
 
   base::TimeTicks ToRendererCompletionTime(
       const PendingRequestInfo& request_info,
diff --git a/content/child/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc
index b9688bb..35c64c8 100644
--- a/content/child/resource_dispatcher_unittest.cc
+++ b/content/child/resource_dispatcher_unittest.cc
@@ -23,7 +23,6 @@
 #include "webkit/common/appcache/appcache_interfaces.h"
 
 using webkit_glue::ResourceLoaderBridge;
-using webkit_glue::ResourceResponseInfo;
 
 namespace content {
 
diff --git a/content/child/site_isolation_policy.cc b/content/child/site_isolation_policy.cc
index d0f2ec4..026f625 100644
--- a/content/child/site_isolation_policy.cc
+++ b/content/child/site_isolation_policy.cc
@@ -11,9 +11,9 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/resource_response_info.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_response_headers.h"
-#include "webkit/common/resource_response_info.h"
 
 using base::StringPiece;
 
@@ -140,12 +140,11 @@ void SiteIsolationPolicy::SetPolicyEnabled(bool enabled) {
 }
 
 linked_ptr<SiteIsolationResponseMetaData>
-SiteIsolationPolicy::OnReceivedResponse(
-    const GURL& frame_origin,
-    const GURL& response_url,
-    ResourceType::Type resource_type,
-    int origin_pid,
-    const webkit_glue::ResourceResponseInfo& info) {
+SiteIsolationPolicy::OnReceivedResponse(const GURL& frame_origin,
+                                        const GURL& response_url,
+                                        ResourceType::Type resource_type,
+                                        int origin_pid,
+                                        const ResourceResponseInfo& info) {
   if (!g_policy_enabled)
     return linked_ptr<SiteIsolationResponseMetaData>();
 
diff --git a/content/child/site_isolation_policy.h b/content/child/site_isolation_policy.h
index 961193b..6c48697 100644
--- a/content/child/site_isolation_policy.h
+++ b/content/child/site_isolation_policy.h
@@ -16,12 +16,10 @@
 
 class GURL;
 
-namespace webkit_glue {
-struct ResourceResponseInfo;
-}
-
 namespace content {
 
+struct ResourceResponseInfo;
+
 // SiteIsolationPolicy implements the cross-site document blocking policy (XSDP)
 // for Site Isolation. XSDP will monitor network responses to a renderer and
 // block illegal responses so that a compromised renderer cannot steal private
@@ -86,9 +84,11 @@ class CONTENT_EXPORT SiteIsolationPolicy {
   // request identified by |request_id|. Any data returned should then be
   // passed to ShouldBlockResponse with the first packet.
   static linked_ptr<SiteIsolationResponseMetaData> OnReceivedResponse(
-      const GURL& frame_origin, const GURL& response_url,
-      ResourceType::Type resource_type, int origin_pid,
-      const webkit_glue::ResourceResponseInfo& info);
+      const GURL& frame_origin,
+      const GURL& response_url,
+      ResourceType::Type resource_type,
+      int origin_pid,
+      const ResourceResponseInfo& info);
 
   // Examines the first network packet in case response_url is registered as a
   // cross-site document by DidReceiveResponse().  In case that this response is
diff --git a/content/child/sync_load_response.h b/content/child/sync_load_response.h
index d19985f..918bdeb 100644
--- a/content/child/sync_load_response.h
+++ b/content/child/sync_load_response.h
@@ -7,14 +7,14 @@
 
 #include <string>
 
+#include "content/public/common/resource_response_info.h"
 #include "url/gurl.h"
-#include "webkit/common/resource_response_info.h"
 
 namespace content {
 
 // See the SyncLoad method. (The name of this struct is not
 // suffixed with "Info" because it also contains the response data.)
-struct SyncLoadResponse : webkit_glue::ResourceResponseInfo {
+struct SyncLoadResponse : ResourceResponseInfo {
   SyncLoadResponse();
   ~SyncLoadResponse();
 
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 0dc5266..9354dd9 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -60,7 +60,6 @@ using blink::WebURLResponse;
 using webkit_glue::MultipartResponseDelegate;
 using webkit_glue::ResourceDevToolsInfo;
 using webkit_glue::ResourceLoaderBridge;
-using webkit_glue::ResourceResponseInfo;
 using webkit_glue::WebURLResponseExtraDataImpl;
 
 namespace content {
diff --git a/content/child/web_url_loader_impl.h b/content/child/web_url_loader_impl.h
index 94f72a1..a2c1f3c 100644
--- a/content/child/web_url_loader_impl.h
+++ b/content/child/web_url_loader_impl.h
@@ -9,12 +9,10 @@
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebURLLoader.h"
 
-namespace webkit_glue {
-struct ResourceResponseInfo;
-}
-
 namespace content {
 
+struct ResourceResponseInfo;
+
 class WebURLLoaderImpl : public blink::WebURLLoader {
  public:
   WebURLLoaderImpl();
@@ -25,7 +23,7 @@ class WebURLLoaderImpl : public blink::WebURLLoader {
                                         int reason);
   CONTENT_EXPORT static void PopulateURLResponse(
       const GURL& url,
-      const webkit_glue::ResourceResponseInfo& info,
+      const ResourceResponseInfo& info,
       blink::WebURLResponse* response);
 
   // WebURLLoader methods:
diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h
index 28765ad..ecda906 100644
--- a/content/common/resource_messages.h
+++ b/content/common/resource_messages.h
@@ -84,7 +84,7 @@ IPC_ENUM_TRAITS_MAX_VALUE( \
     net::HttpResponseInfo::NUM_OF_CONNECTION_INFOS - 1)
 
 IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseHead)
-  IPC_STRUCT_TRAITS_PARENT(webkit_glue::ResourceResponseInfo)
+IPC_STRUCT_TRAITS_PARENT(content::ResourceResponseInfo)
   IPC_STRUCT_TRAITS_MEMBER(error_code)
   IPC_STRUCT_TRAITS_MEMBER(request_start)
   IPC_STRUCT_TRAITS_MEMBER(response_start)
@@ -96,7 +96,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::SyncLoadResult)
   IPC_STRUCT_TRAITS_MEMBER(data)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(webkit_glue::ResourceResponseInfo)
+IPC_STRUCT_TRAITS_BEGIN(content::ResourceResponseInfo)
   IPC_STRUCT_TRAITS_MEMBER(request_time)
   IPC_STRUCT_TRAITS_MEMBER(response_time)
   IPC_STRUCT_TRAITS_MEMBER(headers)
diff --git a/content/content_common.gypi b/content/content_common.gypi
index ae62e7f..7a8a06d 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -90,6 +90,8 @@
       'public/common/renderer_preferences.cc',
       'public/common/renderer_preferences.h',
       'public/common/resource_response.h',
+      'public/common/resource_response_info.cc',
+      'public/common/resource_response_info.h',
       'public/common/result_codes.h',
       'public/common/result_codes_list.h',
       'public/common/sandbox_init.h',
diff --git a/content/public/child/request_peer.h b/content/public/child/request_peer.h
index 7414830..93143c5 100644
--- a/content/public/child/request_peer.h
+++ b/content/public/child/request_peer.h
@@ -16,12 +16,10 @@ namespace base {
 class TimeTicks;
 }
 
-namespace webkit_glue {
-struct ResourceResponseInfo;
-}
-
 namespace content {
 
+struct ResourceResponseInfo;
+
 // This is implemented by our custom resource loader within content. The Peer
 // and it's bridge should have identical lifetimes as they represent each end of
 // a communication channel.
@@ -40,15 +38,13 @@ class CONTENT_EXPORT RequestPeer {
   // information about the redirect, and new_url is the URL that will be loaded
   // if this method returns true. new_first_party_for_cookies is the new
   // first-party URL for cookies should that have changed.
-  virtual bool OnReceivedRedirect(
-      const GURL& new_url,
-      const GURL& new_first_party_for_cookies,
-      const webkit_glue::ResourceResponseInfo& info) = 0;
+  virtual bool OnReceivedRedirect(const GURL& new_url,
+                                  const GURL& new_first_party_for_cookies,
+                                  const ResourceResponseInfo& info) = 0;
 
   // Called when response headers are available (after all redirects have
   // been followed).
-  virtual void OnReceivedResponse(
-      const webkit_glue::ResourceResponseInfo& info) = 0;
+  virtual void OnReceivedResponse(const ResourceResponseInfo& info) = 0;
 
   // Called when a chunk of response data is downloaded.  This method may be
   // called multiple times or not at all if an error occurs.  This method is
diff --git a/content/public/common/resource_response.h b/content/public/common/resource_response.h
index 829a1ea..a9a6add 100644
--- a/content/public/common/resource_response.h
+++ b/content/public/common/resource_response.h
@@ -12,14 +12,14 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
+#include "content/public/common/resource_response_info.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
-#include "webkit/common/resource_response_info.h"
 
 namespace content {
 
 // Parameters for a resource response header.
-struct ResourceResponseHead : webkit_glue::ResourceResponseInfo {
+struct ResourceResponseHead : ResourceResponseInfo {
   // The response error_code.
   int error_code;
   // TimeTicks::Now() when the browser received the request from the renderer.
diff --git a/webkit/common/resource_response_info.cc b/content/public/common/resource_response_info.cc
index 66e612f..4828841 100644
--- a/webkit/common/resource_response_info.cc
+++ b/content/public/common/resource_response_info.cc
@@ -1,13 +1,13 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/common/resource_response_info.h"
+#include "content/public/common/resource_response_info.h"
 
 #include "net/http/http_response_headers.h"
 #include "webkit/common/appcache/appcache_interfaces.h"
 
-namespace webkit_glue {
+namespace content {
 
 ResourceResponseInfo::ResourceResponseInfo()
     : content_length(-1),
@@ -20,6 +20,7 @@ ResourceResponseInfo::ResourceResponseInfo()
       was_fetched_via_proxy(false) {
 }
 
-ResourceResponseInfo::~ResourceResponseInfo() {}
+ResourceResponseInfo::~ResourceResponseInfo() {
+}
 
-}  // namespace webkit_glue
+}  // namespace content
diff --git a/webkit/common/resource_response_info.h b/content/public/common/resource_response_info.h
index 5f8b88b..a4231e8 100644
--- a/webkit/common/resource_response_info.h
+++ b/content/public/common/resource_response_info.h
@@ -1,9 +1,9 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_COMMON_RESOURCE_RESPONSE_INFO_H_
-#define WEBKIT_COMMON_RESOURCE_RESPONSE_INFO_H_
+#ifndef CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_
+#define CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_
 
 #include <string>
 
@@ -11,17 +11,18 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
+#include "content/common/content_export.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/load_timing_info.h"
 #include "net/http/http_response_info.h"
 #include "url/gurl.h"
 #include "webkit/common/resource_devtools_info.h"
 
-namespace webkit_glue {
+namespace content {
 
 struct ResourceResponseInfo {
-  WEBKIT_COMMON_EXPORT ResourceResponseInfo();
-  WEBKIT_COMMON_EXPORT ~ResourceResponseInfo();
+  CONTENT_EXPORT ResourceResponseInfo();
+  CONTENT_EXPORT ~ResourceResponseInfo();
 
   // The time at which the request was made that resulted in this response.
   // For cached responses, this time could be "far" in the past.
@@ -66,7 +67,7 @@ struct ResourceResponseInfo {
   // Actual request and response headers, as obtained from the network stack.
   // Only present if request had LOAD_REPORT_RAW_HEADERS in load_flags, and
   // requesting renderer had CanReadRowCookies permission.
-  scoped_refptr<ResourceDevToolsInfo> devtools_info;
+  scoped_refptr<webkit_glue::ResourceDevToolsInfo> devtools_info;
 
   // The path to a file that will contain the response body.  It may only
   // contain a portion of the response body at the time that the ResponseInfo
@@ -98,6 +99,6 @@ struct ResourceResponseInfo {
   net::HostPortPair socket_address;
 };
 
-}  // namespace webkit_glue
+}  // namespace content
 
-#endif  // WEBKIT_COMMON_RESOURCE_RESPONSE_INFO_H_
+#endif  // CONTENT_PUBLIC_COMMON_RESOURCE_RESPONSE_INFO_H_
diff --git a/webkit/common/webkit_common.gyp b/webkit/common/webkit_common.gyp
index dd3e20e..9638ded 100644
--- a/webkit/common/webkit_common.gyp
+++ b/webkit/common/webkit_common.gyp
@@ -43,8 +43,6 @@
         'data_element.h',
         'resource_devtools_info.cc',
         'resource_devtools_info.h',
-        'resource_response_info.cc',
-        'resource_response_info.h',
         'resource_type.cc',
         'resource_type.h',
         'webkit_common_export.h',