Move resource_response_info from webkit/ to content/

chrome/renderer/security_filter_peer.cc

 // Copyright (c) 2012 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 "chrome/renderer/security_filter_peer.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_errors.h"
@@ skipping 53 matching lines @@
   return new ReplaceContentPeer(peer, "text/html", html);
 }
 
 void SecurityFilterPeer::OnUploadProgress(uint64 position, uint64 size) {
   original_peer_->OnUploadProgress(position, 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();
 }
 
 void SecurityFilterPeer::OnReceivedData(const char* data,
                                         int data_length,
                                         int encoded_data_length) {
   NOTREACHED();
 }
 
 void SecurityFilterPeer::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
     bool stale_copy_in_cache,
     const std::string& security_info,
     const base::TimeTicks& completion_time,
     int64 total_transfer_size) {
   NOTREACHED();
 }
 
 // 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;
   // Let's create our own HTTP headers.
   std::string raw_headers;
   raw_headers.append("HTTP/1.1 200 OK");
   raw_headers.push_back('\0');
   // Don't cache the data we are serving, it is not the real data for that URL
   // (if the filtered resource were to make it into the WebCore cache, then the
   // same URL loaded in a safe scenario would still return the filtered
@@ skipping 15 matching lines @@
 // BufferedPeer
 
 BufferedPeer::BufferedPeer(content::RequestPeer* peer,
                            const std::string& mime_type)
     : SecurityFilterPeer(peer), mime_type_(mime_type) {}
 
 BufferedPeer::~BufferedPeer() {
 }
 
 void BufferedPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   ProcessResponseInfo(info, &response_info_, mime_type_);
 }
 
 void BufferedPeer::OnReceivedData(const char* data,
                                   int data_length,
                                   int encoded_data_length) {
   data_.append(data, data_length);
 }
 
 void BufferedPeer::OnCompletedRequest(int error_code,
@@ skipping 33 matching lines @@
                                        const std::string& mime_type,
                                        const std::string& data)
     : SecurityFilterPeer(peer),
       mime_type_(mime_type),
       data_(data) {}
 
 ReplaceContentPeer::~ReplaceContentPeer() {
 }
 
 void ReplaceContentPeer::OnReceivedResponse(
-    const webkit_glue::ResourceResponseInfo& info) {
+    const content::ResourceResponseInfo& info) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
 void ReplaceContentPeer::OnReceivedData(const char* data,
                                         int data_length,
                                         int encoded_data_length) {
   // Ignore this, we'll serve some alternate content in OnCompletedRequest.
 }
 
 void ReplaceContentPeer::OnCompletedRequest(
     int error_code,
     bool was_ignored_by_handler,
     bool stale_copy_in_cache,
     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());
   original_peer_->OnReceivedResponse(info);
   if (!data_.empty())
     original_peer_->OnReceivedData(data_.data(),
                                    static_cast<int>(data_.size()),
                                    -1);
   original_peer_->OnCompletedRequest(net::OK,
                                      false,
                                      stale_copy_in_cache,
                                      security_info,
                                      completion_time,
                                      total_transfer_size);
 
   // The request processing is complete, we must delete ourselves.
   delete this;
 }