Move resource_response_info from webkit/ to content/

chrome/renderer/security_filter_peer.cc

Index: chrome/renderer/security_filter_peer.cc
diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc
index 24be8f9c3bdadcad307b8d84dba1ae012bf45d08..c43b451caaf0939eafc86b105fbaffb75e3a240a 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());