summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc8
-rw-r--r--content/browser/loader/resource_loader.cc3
2 files changed, 3 insertions, 8 deletions
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index fcef97b..443f36c 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -503,10 +503,6 @@ void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
content::ResourceContext* resource_context,
content::ResourceResponse* response,
IPC::Sender* sender) {
- // TODO(mmenke): Figure out if LOAD_ENABLE_LOAD_TIMING is safe to remove.
- if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING)
- request->GetLoadTimingInfo(&response->head.load_timing);
-
const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
if (request->url().SchemeIsSecure()) {
@@ -564,10 +560,6 @@ void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
net::URLRequest* request,
content::ResourceContext* resource_context,
content::ResourceResponse* response) {
- // TODO(mmenke): Figure out if LOAD_ENABLE_LOAD_TIMING is safe to remove.
- if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING)
- request->GetLoadTimingInfo(&response->head.load_timing);
-
ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
#if defined(ENABLE_ONE_CLICK_SIGNIN)
diff --git a/content/browser/loader/resource_loader.cc b/content/browser/loader/resource_loader.cc
index a984b20..63f0a2c 100644
--- a/content/browser/loader/resource_loader.cc
+++ b/content/browser/loader/resource_loader.cc
@@ -54,6 +54,9 @@ void PopulateResourceResponse(net::URLRequest* request,
request,
&response->head.appcache_id,
&response->head.appcache_manifest_url);
+ // TODO(mmenke): Figure out if LOAD_ENABLE_LOAD_TIMING is safe to remove.
+ if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING)
+ request->GetLoadTimingInfo(&response->head.load_timing);
}
} // namespace