2 files changed, 12 insertions, 9 deletions
diff --git a/chrome/browser/net/load_timing_observer.cc b/chrome/browser/net/load_timing_observer.cc
index 58963cb..f0d33e2 100644
--- a/chrome/browser/net/load_timing_observer.cc
+++ b/chrome/browser/net/load_timing_observer.cc
@@ -6,7 +6,7 @@
 
 #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"
@@ -99,8 +99,9 @@ void LoadTimingObserver::OnAddEntry(net::NetLog::EventType type,
 }
 
 // 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;
@@ -115,9 +116,9 @@ void LoadTimingObserver::PopulateTimingInfo(net::URLRequest* request,
   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;
   }
 }
 
diff --git a/chrome/browser/net/load_timing_observer.h b/chrome/browser/net/load_timing_observer.h
index 444c3d4..a44a3be 100644
--- a/chrome/browser/net/load_timing_observer.h
+++ b/chrome/browser/net/load_timing_observer.h
@@ -13,12 +13,14 @@
 #include "net/base/net_log.h"
 #include "webkit/glue/resource_loader_bridge.h"
 
+namespace content {
+struct ResourceResponse;
+}
+
 namespace net {
 class URLRequest;
 }  // namespace net
 
-struct ResourceResponse;
-
 // LoadTimingObserver watches the NetLog event stream and collects the network
 // timing information.
 //
@@ -72,7 +74,7 @@ class LoadTimingObserver : public ChromeNetLog::ThreadSafeObserverImpl {
                           net::NetLog::EventParameters* params) OVERRIDE;
 
   static void PopulateTimingInfo(net::URLRequest* request,
-                                 ResourceResponse* response);
+                                 content::ResourceResponse* response);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(LoadTimingObserverTest,