[page_load_metrics] Log cache warmth ratios at parse stop

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 <stdint.h>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/component_updater/component_updater_resource_throttle.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_resource_throttle.h"
 #include "chrome/browser/mod_pagespeed/mod_pagespeed_metrics.h"
 #include "chrome/browser/net/resource_prefetch_predictor_observer.h"
+#include "chrome/browser/page_load_metrics/metrics_web_contents_observer.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/prerender/prerender_resource_throttle.h"
 #include "chrome/browser/prerender/prerender_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/renderer_host/chrome_navigation_data.h"
 #include "chrome/browser/renderer_host/predictor_resource_throttle.h"
 #include "chrome/browser/renderer_host/safe_browsing_resource_throttle.h"
@@ skipping 117 matching lines @@
   if (!browser_context)
     return NULL;
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile)
     return NULL;
 
   return prerender::PrerenderManagerFactory::GetForProfile(profile);
 }
 
-void UpdatePrerenderNetworkBytesCallback(
-    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
-    int64_t bytes) {
+void UpdatePrerenderNetworkBytesCallback(content::WebContents* web_contents,
+                                         int64_t bytes) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  content::WebContents* web_contents = web_contents_getter.Run();
   // PrerenderContents::FromWebContents handles the NULL case.
   prerender::PrerenderContents* prerender_contents =
       prerender::PrerenderContents::FromWebContents(web_contents);
 
   if (prerender_contents)
     prerender_contents->AddNetworkBytes(bytes);
 
   prerender::PrerenderManager* prerender_manager =
       GetPrerenderManager(web_contents);
   if (prerender_manager)
@@ skipping 96 matching lines @@
 
   if (crx_id) {
     // We got a component we need to install, so throttle the resource
     // until the component is installed.
     throttles->push_back(
         component_updater::GetOnDemandResourceThrottle(cus, crx_id));
   }
 }
 #endif  // !defined(DISABLE_NACL)
 
 // This function is called in RequestComplete to log metrics about main frame

[Lei Zhang, 2016/08/09 19:14:17]

This comment is slightly out of date?

[Charlie Harrison, 2016/08/09 19:32:49]

Updated.

 // resources.
-void LogMainFrameMetricsOnUIThread(
-    const GURL& url,
-    int net_error,
-    base::TimeDelta request_loading_time,
-    const content::ResourceRequestInfo::WebContentsGetter&
-        web_contents_getter) {
-  content::WebContents* web_contents = web_contents_getter.Run();
+void LogMainFrameMetricsOnUIThread(const GURL& url,
+                                   int net_error,
+                                   base::TimeDelta request_loading_time,
+                                   content::WebContents* web_contents) {
   if (!web_contents)

[Lei Zhang, 2016/08/09 19:14:17]

Seems this should never eval to false now.

[Charlie Harrison, 2016/08/09 19:32:49]

Removed.

     return;
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
 
   // The rest of the function is only concerned about NTP metrics.
   if (!profile || !search::IsNTPURL(url, profile))
     return;
 
   // A http/s scheme implies that the new tab page is remote. The local NTP is
   // served from chrome-search://. To segment out remote NTPs, use the
@@ skipping 32 matching lines @@
     if (net_error == net::OK) {
       UMA_HISTOGRAM_LONG_TIMES("Net.NTP.Local.RequestTime2.Success",
                                request_loading_time);
     } else if (net_error == net::ERR_ABORTED) {
       UMA_HISTOGRAM_LONG_TIMES("Net.NTP.Local.RequestTime2.ErrAborted",
                                request_loading_time);
     }
   }
 }
 
+void NotifyUIThreadOfRequestComplete(
+    const content::ResourceRequestInfo::WebContentsGetter& web_contents_getter,
+    const GURL& url,
+    content::ResourceType resource_type,
+    bool was_cached,
+    int net_error,
+    int64_t total_received_bytes,
+    base::TimeDelta request_loading_time) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  content::WebContents* web_contents = web_contents_getter.Run();
+  if (!web_contents)
+    return;
+  if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) {
+    LogMainFrameMetricsOnUIThread(url, net_error, request_loading_time,
+                                  web_contents);
+  }
+  if (!was_cached)
+    UpdatePrerenderNetworkBytesCallback(web_contents, total_received_bytes);
+  page_load_metrics::MetricsWebContentsObserver* metrics_observer =
+      page_load_metrics::MetricsWebContentsObserver::FromWebContents(
+          web_contents);
+  if (metrics_observer) {
+    metrics_observer->OnRequestComplete(resource_type, was_cached, net_error);
+  }
+}
+
 }  // namespace
 
 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
     : download_request_limiter_(g_browser_process->download_request_limiter()),
       safe_browsing_(g_browser_process->safe_browsing_service())
 #if defined(ENABLE_EXTENSIONS)
       , user_script_listener_(new extensions::UserScriptListener())
 #endif
       {
   BrowserThread::PostTask(
@@ skipping 427 matching lines @@
         redirect_url, request);
   }
 
   if (io_data->policy_header_helper())
     io_data->policy_header_helper()->AddPolicyHeaders(redirect_url, request);
 }
 
 // Notification that a request has completed.
 void ChromeResourceDispatcherHostDelegate::RequestComplete(
     net::URLRequest* url_request) {
-  // Jump on the UI thread and inform the prerender about the bytes.
+  if (!url_request)
+    return;
   const ResourceRequestInfo* info =
       ResourceRequestInfo::ForRequest(url_request);
-  if (url_request && !url_request->was_cached()) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-                            base::Bind(&UpdatePrerenderNetworkBytesCallback,
-                                       info->GetWebContentsGetterForRequest(),
-                                       url_request->GetTotalReceivedBytes()));
-  }
-
-  if (url_request &&
-      info->GetResourceType() == content::RESOURCE_TYPE_MAIN_FRAME) {
-    BrowserThread::PostTask(
-        BrowserThread::UI, FROM_HERE,
-        base::Bind(&LogMainFrameMetricsOnUIThread, url_request->url(),
-                   url_request->status().error(),
-                   base::TimeTicks::Now() - url_request->creation_time(),
-                   info->GetWebContentsGetterForRequest()));
-  }
+  BrowserThread::PostTask(
+      BrowserThread::UI, FROM_HERE,
+      base::Bind(&NotifyUIThreadOfRequestComplete,
+                 info->GetWebContentsGetterForRequest(), url_request->url(),
+                 info->GetResourceType(), url_request->was_cached(),
+                 url_request->status().error(),
+                 url_request->GetTotalReceivedBytes(),
+                 base::TimeTicks::Now() - url_request->creation_time()));
 }
 
 bool ChromeResourceDispatcherHostDelegate::ShouldEnableLoFiMode(
     const net::URLRequest& url_request,
     content::ResourceContext* resource_context) {
   ProfileIOData* io_data = ProfileIOData::FromResourceContext(resource_context);
   data_reduction_proxy::DataReductionProxyIOData* data_reduction_proxy_io_data =
       io_data->data_reduction_proxy_io_data();
 
   if (data_reduction_proxy_io_data)
@@ skipping 26 matching lines @@
     data->SetDataReductionProxyData(data_reduction_proxy_data->DeepCopy());
   return data;
 }
 
 std::unique_ptr<net::ClientCertStore>
 ChromeResourceDispatcherHostDelegate::CreateClientCertStore(
     content::ResourceContext* resource_context) {
   return ProfileIOData::FromResourceContext(resource_context)->
       CreateClientCertStore();
 }