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

chrome/browser/net/load_timing_observer.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/net/load_timing_observer.h"
 
 #include "base/time.h"
 #include "chrome/browser/net/chrome_net_log.h"
-#include "content/common/resource_response.h"
+#include "content/public/common/resource_response.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_netlog_params.h"
 
 using base::Time;
 using base::TimeTicks;
 using content::BrowserThread;
 using webkit_glue::ResourceLoaderBridge;
 using webkit_glue::ResourceLoadTimingInfo;
@@ skipping 72 matching lines @@
     OnAddURLRequestEntry(type, time, source, phase, params);
   else if (source.type == net::NetLog::SOURCE_HTTP_STREAM_JOB)
     OnAddHTTPStreamJobEntry(type, time, source, phase, params);
   else if (source.type == net::NetLog::SOURCE_CONNECT_JOB)
     OnAddConnectJobEntry(type, time, source, phase, params);
   else if (source.type == net::NetLog::SOURCE_SOCKET)
     OnAddSocketEntry(type, time, source, phase, params);
 }
 
 // static
-void LoadTimingObserver::PopulateTimingInfo(net::URLRequest* request,
-                                            ResourceResponse* response) {
+void LoadTimingObserver::PopulateTimingInfo(
+    net::URLRequest* request,
+    content::ResourceResponse* response) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!(request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING))
     return;
 
   ChromeNetLog* chrome_net_log = static_cast<ChromeNetLog*>(
       request->net_log().net_log());
   if (chrome_net_log == NULL)
     return;
 
   uint32 source_id = request->net_log().source().id;
   LoadTimingObserver* observer = chrome_net_log->load_timing_observer();
   LoadTimingObserver::URLRequestRecord* record =
       observer->GetURLRequestRecord(source_id);
   if (record) {
-    response->response_head.connection_id = record->socket_log_id;
-    response->response_head.connection_reused = record->socket_reused;
-    response->response_head.load_timing = record->timing;
+    response->connection_id = record->socket_log_id;
+    response->connection_reused = record->socket_reused;
+    response->load_timing = record->timing;
   }
 }
 
 void LoadTimingObserver::OnAddURLRequestEntry(
     net::NetLog::EventType type,
     const base::TimeTicks& time,
     const net::NetLog::Source& source,
     net::NetLog::EventPhase phase,
     net::NetLog::EventParameters* params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 236 matching lines @@
   if (it == socket_to_record_.end())
     return;
 
   if (type == net::NetLog::TYPE_SSL_CONNECT) {
     if (is_begin)
       it->second.ssl_start = time;
     else if (is_end)
       it->second.ssl_end = time;
   }
 }