Move ResourceResponse struct into the Content API, since it's used in Chrome. While at it, I also...

chrome/browser/renderer_host/safe_browsing_resource_handler.cc

 // Copyright (c) 2011 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/browser/renderer_host/safe_browsing_resource_handler.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/renderer_host/chrome_url_request_user_data.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/renderer_host/resource_message_filter.h"
-#include "content/common/resource_response.h"
+#include "content/public/common/resource_response.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request.h"
 
 // Maximum time in milliseconds to wait for the safe browsing service to
 // verify a URL. After this amount of time the outstanding check will be
 // aborted, and the URL will be treated as if it were safe.
 static const int kCheckUrlTimeoutMs = 5000;
 
@@ skipping 37 matching lines @@
 
 bool SafeBrowsingResourceHandler::OnUploadProgress(int request_id,
                                                    uint64 position,
                                                    uint64 size) {
   return next_handler_->OnUploadProgress(request_id, position, size);
 }
 
 bool SafeBrowsingResourceHandler::OnRequestRedirected(
     int request_id,
     const GURL& new_url,
-    ResourceResponse* response,
+    content::ResourceResponse* response,
     bool* defer) {
   CHECK(state_ == STATE_NONE);
   CHECK(defer_state_ == DEFERRED_NONE);
 
   // Save the redirect urls for possible malware detail reporting later.
   redirect_urls_.push_back(new_url);
 
   // We need to check the new URL before following the redirect.
   if (CheckUrl(new_url)) {
     return next_handler_->OnRequestRedirected(
         request_id, new_url, response, defer);
   }
 
   // If the URL couldn't be verified synchronously, defer following the
   // redirect until the SafeBrowsing check is complete. Store the redirect
   // context so we can pass it on to other handlers once we have completed
   // our check.
   defer_state_ = DEFERRED_REDIRECT;
   deferred_request_id_ = request_id;
   deferred_url_ = new_url;
   deferred_redirect_response_ = response;
   *defer = true;
 
   return true;
 }
 
 bool SafeBrowsingResourceHandler::OnResponseStarted(
-    int request_id, ResourceResponse* response) {
+    int request_id, content::ResourceResponse* response) {
   CHECK(state_ == STATE_NONE);
   CHECK(defer_state_ == DEFERRED_NONE);
   return next_handler_->OnResponseStarted(request_id, response);
 }
 
 void SafeBrowsingResourceHandler::OnCheckUrlTimeout() {
   CHECK(state_ == STATE_CHECKING_URL);
   CHECK(defer_state_ != DEFERRED_NONE);
   safe_browsing_->CancelCheck(this);
   OnBrowseUrlCheckResult(deferred_url_, SafeBrowsingService::SAFE);
@@ skipping 215 matching lines @@
     rdh_->StartDeferredRequest(render_process_host_id_, request_id);
 }
 
 void SafeBrowsingResourceHandler::ResumeRedirect() {
   CHECK(defer_state_ == DEFERRED_REDIRECT);
   defer_state_ = DEFERRED_NONE;
 
   // Retrieve the details for the paused OnReceivedRedirect().
   int request_id = deferred_request_id_;
   GURL redirect_url = deferred_url_;
-  scoped_refptr<ResourceResponse> redirect_response =
+  scoped_refptr<content::ResourceResponse> redirect_response =
       deferred_redirect_response_;
 
   ClearDeferredRequestInfo();
 
   // Give the other resource handlers a chance to handle the redirect.
   bool defer = false;
   // TODO(eroman): the return value is being lost here. Should
   // use it to cancel the request.
   next_handler_->OnRequestRedirected(request_id, redirect_url,
                                      redirect_response, &defer);
   if (!defer) {
     rdh_->FollowDeferredRedirect(render_process_host_id_, request_id,
                                  false, GURL());
   }
 }
 
 void SafeBrowsingResourceHandler::ClearDeferredRequestInfo() {
   deferred_request_id_ = -1;
   deferred_url_ = GURL();
   deferred_redirect_response_ = NULL;
 }