Fix a load timing bug in the case of SPDY session reuse

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

 // Copyright (c) 2012 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/chrome_resource_dispatcher_host_delegate.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/logging.h"
@@ skipping 72 matching lines @@
                                                render_view_id);
   if (!rvh)
     return;
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_DOWNLOAD_INITIATED,
       content::Source<RenderViewHost>(rvh),
       content::NotificationService::NoDetails());
 }
 
-// The network stack returns actual connect times, while the renderer process
-// expects times that the request was blocked in each phase of setting up
-// a connection.  Due to preconnect and late binding, it is possible for a
-// connection attempt to start before a request has been started, so this
-// function is needed to convert times from the network stack to times the
-// renderer process expects.
-void FixupLoadTimingInfo(net::LoadTimingInfo* load_timing_info) {
-  // If there are no times, do nothing.
-  if (load_timing_info->request_start.is_null())
-    return;
-
-  // Starting the request and resolving the proxy are the only phases of the
-  // request that occur before it blocks on starting a connection.
-  base::TimeTicks block_on_connect_start = load_timing_info->request_start;
-  if (!load_timing_info->proxy_resolve_end.is_null())
-    block_on_connect_start = load_timing_info->proxy_resolve_end;
-
-  net::LoadTimingInfo::ConnectTiming* connect_timing =
-      &load_timing_info->connect_timing;
-  if (!connect_timing->dns_start.is_null()) {
-    DCHECK(!connect_timing->dns_end.is_null());
-    if (connect_timing->dns_start < block_on_connect_start)
-      connect_timing->dns_start = block_on_connect_start;
-    if (connect_timing->dns_end < block_on_connect_start)
-      connect_timing->dns_end = block_on_connect_start;
-  }
-
-  if (!connect_timing->connect_start.is_null()) {
-    DCHECK(!connect_timing->connect_end.is_null());
-    if (connect_timing->connect_start < block_on_connect_start)
-      connect_timing->connect_start = block_on_connect_start;
-    if (connect_timing->connect_end < block_on_connect_start)
-      connect_timing->connect_end = block_on_connect_start;
-  }
-
-  if (!connect_timing->ssl_start.is_null()) {
-    DCHECK(!connect_timing->ssl_end.is_null());
-    if (connect_timing->ssl_start < block_on_connect_start)
-      connect_timing->ssl_start = block_on_connect_start;
-    if (connect_timing->ssl_end < block_on_connect_start)
-      connect_timing->ssl_end = block_on_connect_start;
-  }
-}
-
 // Goes through the extension's file browser handlers and checks if there is one
 // that can handle the |mime_type|.
 // |extension| must not be NULL.
 bool ExtensionCanHandleMimeType(const Extension* extension,
                                 const std::string& mime_type) {
   MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
   if (!handler)
     return false;
 
   return handler->CanHandleMIMEType(mime_type);
@@ skipping 378 matching lines @@
                  target_id));
 #endif
 }
 
 void ChromeResourceDispatcherHostDelegate::OnResponseStarted(
     net::URLRequest* request,
     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) {
+  if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING)
     request->GetLoadTimingInfo(&response->head.load_timing);
-    FixupLoadTimingInfo(&response->head.load_timing);
-  }
 
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
 
   if (request->url().SchemeIsSecure()) {
     const net::URLRequestContext* context = request->context();
     net::TransportSecurityState* state = context->transport_security_state();
     if (state) {
       net::TransportSecurityState::DomainState domain_state;
       bool has_sni = net::SSLConfigService::IsSNIAvailable(
           context->ssl_config_service());
@@ skipping 39 matching lines @@
 
   prerender::URLRequestResponseStarted(request);
 }
 
 void ChromeResourceDispatcherHostDelegate::OnRequestRedirected(
     const GURL& redirect_url,
     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) {
+  if (request->load_flags() & net::LOAD_ENABLE_LOAD_TIMING)
     request->GetLoadTimingInfo(&response->head.load_timing);
-    FixupLoadTimingInfo(&response->head.load_timing);
-  }
 
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   const ResourceRequestInfo* info = ResourceRequestInfo::ForRequest(request);
 
   // See if the response contains the Google-Accounts-SignIn header.  If so,
   // then the user has just finished signing in, and the server is allowing the
   // browser to suggest connecting the user's profile to the account.
   OneClickSigninHelper::ShowInfoBarIfPossible(request, io_data,
@@ skipping 10 matching lines @@
   int child_id, route_id;
   if (!prerender::PrerenderManager::DoesURLHaveValidScheme(redirect_url) &&
       ResourceRequestInfo::ForRequest(request)->GetAssociatedRenderView(
           &child_id, &route_id) &&
       prerender_tracker_->IsPrerenderingOnIOThread(child_id, route_id)) {
     prerender_tracker_->TryCancel(
         child_id, route_id, prerender::FINAL_STATUS_UNSUPPORTED_SCHEME);
     request->Cancel();
   }
 }