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

content/browser/renderer_host/sync_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 "content/browser/renderer_host/sync_resource_handler.h"
 
 #include "base/logging.h"
 #include "content/browser/debugger/devtools_netlog_observer.h"
 #include "content/browser/renderer_host/global_request_id.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
@@ skipping 17 matching lines @@
 
 SyncResourceHandler::~SyncResourceHandler() {
 }
 
 bool SyncResourceHandler::OnUploadProgress(int request_id,
                                            uint64 position,
                                            uint64 size) {
   return true;
 }
 
-bool SyncResourceHandler::OnRequestRedirected(int request_id,
-                                              const GURL& new_url,
-                                              ResourceResponse* response,
-                                              bool* defer) {
+bool SyncResourceHandler::OnRequestRedirected(
+    int request_id,
+    const GURL& new_url,
+    content::ResourceResponse* response,
+    bool* defer) {
   net::URLRequest* request = rdh_->GetURLRequest(
       GlobalRequestID(filter_->child_id(), request_id));
   if (rdh_->delegate())
     rdh_->delegate()->OnRequestRedirected(request, response, filter_);
 
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
   // TODO(darin): It would be much better if this could live in WebCore, but
   // doing so requires API changes at all levels.  Similar code exists in
   // WebCore/platform/network/cf/ResourceHandleCFNet.cpp :-(
   if (new_url.GetOrigin() != result_.final_url.GetOrigin()) {
     LOG(ERROR) << "Cross origin redirect denied";
     return false;
   }
   result_.final_url = new_url;
   return true;
 }
 
-bool SyncResourceHandler::OnResponseStarted(int request_id,
-                                            ResourceResponse* response) {
+bool SyncResourceHandler::OnResponseStarted(
+    int request_id,
+    content::ResourceResponse* response) {
   net::URLRequest* request = rdh_->GetURLRequest(
       GlobalRequestID(filter_->child_id(), request_id));
   if (rdh_->delegate())
     rdh_->delegate()->OnResponseStarted(request, response, filter_);
 
   DevToolsNetLogObserver::PopulateResponseInfo(request, response);
 
   // We don't care about copying the status here.
-  result_.headers = response->response_head.headers;
-  result_.mime_type = response->response_head.mime_type;
-  result_.charset = response->response_head.charset;
-  result_.download_file_path = response->response_head.download_file_path;
-  result_.request_time = response->response_head.request_time;
-  result_.response_time = response->response_head.response_time;
-  result_.connection_id = response->response_head.connection_id;
-  result_.connection_reused = response->response_head.connection_reused;
-  result_.load_timing = response->response_head.load_timing;
-  result_.devtools_info = response->response_head.devtools_info;
+  result_.headers = response->headers;
+  result_.mime_type = response->mime_type;
+  result_.charset = response->charset;
+  result_.download_file_path = response->download_file_path;
+  result_.request_time = response->request_time;
+  result_.response_time = response->response_time;
+  result_.connection_id = response->connection_id;
+  result_.connection_reused = response->connection_reused;
+  result_.load_timing = response->load_timing;
+  result_.devtools_info = response->devtools_info;
   return true;
 }
 
 bool SyncResourceHandler::OnWillStart(int request_id,
                                       const GURL& url,
                                       bool* defer) {
   return true;
 }
 
 bool SyncResourceHandler::OnWillRead(int request_id, net::IOBuffer** buf,
@@ skipping 28 matching lines @@
   return true;
 }
 
 void SyncResourceHandler::OnRequestClosed() {
   if (!result_message_)
     return;
 
   result_message_->set_reply_error();
   filter_->Send(result_message_);
 }