Generalize abort tracking to page end state tracking

chrome/browser/page_load_metrics/observers/core_page_load_metrics_observer.cc

 // Copyright 2015 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/page_load_metrics/observers/core_page_load_metrics_observer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 139 matching lines @@
 const char kHistogramLoadTypeFirstContentfulPaintForwardBack[] =
     "PageLoad.PaintTiming.NavigationToFirstContentfulPaint.LoadType."
     "ForwardBackNavigation";
 const char kHistogramLoadTypeFirstContentfulPaintForwardBackNoStore[] =
     "PageLoad.PaintTiming.NavigationToFirstContentfulPaint.LoadType."
     "ForwardBackNavigation.NoStore";
 const char kHistogramLoadTypeFirstContentfulPaintNewNavigation[] =
     "PageLoad.PaintTiming.NavigationToFirstContentfulPaint.LoadType."
     "NewNavigation";
 
+const char kHistogramPageTimingPageEnd[] =
+    "PageLoad.Experimental.PageTiming.NavigationToPageEnd";
+const char kHistogramPageTimingFirstPaintToPageEnd[] =
+    "PageLoad.Experimental.PageTiming.FirstPaintToPageEnd";
+
+const char kHistogramPageTimingPageEndNoEndTime[] =
+    "PageLoad.Experimental.PageTiming.NavigationToPageEnd.NoEndTime";
+const char kHistogramPageTimingFirstPaintToPageEndNoEndTime[] =
+    "PageLoad.Experimental.PageTiming.FirstPaintToPageEnd.NoEndTime";
+
+const char kHistogramPageTimingFirstBackground[] =
+    "PageLoad.Experimental.PageTiming.NavigationToFirstBackground";
+const char kHistogramPageTimingFirstPaintToFirstBackground[] =
+    "PageLoad.Experimental.PageTiming.FirstPaintToFirstBackground";
+
 const char kHistogramLoadTypeParseStartReload[] =
     "PageLoad.ParseTiming.NavigationToParseStart.LoadType.Reload";
 const char kHistogramLoadTypeParseStartForwardBack[] =
     "PageLoad.ParseTiming.NavigationToParseStart.LoadType."
     "ForwardBackNavigation";
 const char kHistogramLoadTypeParseStartForwardBackNoStore[] =
     "PageLoad.ParseTiming.NavigationToParseStart.LoadType."
     "ForwardBackNavigation.NoStore";
 const char kHistogramLoadTypeParseStartNewNavigation[] =
     "PageLoad.ParseTiming.NavigationToParseStart.LoadType.NewNavigation";
 
 const char kHistogramFirstForeground[] =
-    "PageLoad.Timing2.NavigationToFirstForeground";
+    "PageLoad.PageTiming.NavigationToFirstForeground";
 
 const char kHistogramFailedProvisionalLoad[] =
-    "PageLoad.Timing2.NavigationToFailedProvisionalLoad";
+    "PageLoad.PageTiming.NavigationToFailedProvisionalLoad";
 
 const char kHistogramForegroundToFirstPaint[] =
     "PageLoad.PaintTiming.ForegroundToFirstPaint";
 
 const char kHistogramCacheRequestPercentParseStop[] =
     "PageLoad.Experimental.Cache.RequestPercent.ParseStop";
 const char kHistogramCacheTotalRequestsParseStop[] =
     "PageLoad.Experimental.Cache.TotalRequests.ParseStop";
 const char kHistogramTotalRequestsParseStop[] =
     "PageLoad.Experimental.TotalRequests.ParseStop";
@@ skipping 439 matching lines @@
     ++num_network_resources_;
     network_bytes_ += extra_request_info.raw_body_bytes;
   }
 }
 
 void CorePageLoadMetricsObserver::RecordTimingHistograms(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   // Log time to first foreground / time to first background. Log counts that we
   // started a relevant page load in the foreground / background.
-  if (!info.started_in_foreground) {
-    if (info.first_foreground_time)
-      PAGE_LOAD_HISTOGRAM(internal::kHistogramFirstForeground,
-                          info.first_foreground_time.value());
+  if (!info.started_in_foreground && info.first_foreground_time) {
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramFirstForeground,
+                        info.first_foreground_time.value());
   }
 
   if (timing.first_paint && !timing.first_meaningful_paint) {
     RecordFirstMeaningfulPaintStatus(
         timing.first_contentful_paint ?
         internal::FIRST_MEANINGFUL_PAINT_DID_NOT_REACH_NETWORK_STABLE :
         internal::FIRST_MEANINGFUL_PAINT_DID_NOT_REACH_FIRST_CONTENTFUL_PAINT);
   }
 
   if (timing.first_paint) {
@@ skipping 12 matching lines @@
   }
   if (timing.first_meaningful_paint) {
     if (first_user_interaction_after_first_paint_.is_null()) {
       PAGE_LOAD_HISTOGRAM(internal::kHistogramFirstMeaningfulPaintNoUserInput,
                           timing.first_meaningful_paint.value());
     } else {
       PAGE_LOAD_HISTOGRAM(internal::kHistogramFirstMeaningfulPaintHadUserInput,
                           timing.first_meaningful_paint.value());
     }
   }
+
+  if (!info.started_in_foreground)
+    return;
+
+  if (info.first_background_time) {
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramPageTimingFirstBackground,
+                        info.first_background_time.value());
+    if (timing.first_paint &&
+        timing.first_paint <= info.first_background_time) {
+      PAGE_LOAD_HISTOGRAM(
+          internal::kHistogramPageTimingFirstPaintToFirstBackground,
+          info.first_background_time.value() - timing.first_paint.value());
+    }
+  } else if (info.page_end_time) {
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramPageTimingPageEnd,
+                        info.page_end_time.value());
+    if (timing.first_paint && timing.first_paint <= info.page_end_time) {
+      PAGE_LOAD_HISTOGRAM(
+          internal::kHistogramPageTimingFirstPaintToPageEnd,
+          info.page_end_time.value() - timing.first_paint.value());
+    }
+  } else {
+    // If we terminate via FlushMetricsOnAppEnterBackground, we may have neither
+    // a first_background_time nor a page_end_time.
+    base::TimeDelta end_time = base::TimeTicks::Now() - navigation_start_;
+    PAGE_LOAD_HISTOGRAM(internal::kHistogramPageTimingPageEndNoEndTime,
+                        end_time);
+    if (timing.first_paint && timing.first_paint <= end_time) {
+      PAGE_LOAD_HISTOGRAM(
+          internal::kHistogramPageTimingFirstPaintToPageEndNoEndTime,
+          end_time - timing.first_paint.value());
+    }
+  }
 }
 
 void CorePageLoadMetricsObserver::RecordByteAndResourceHistograms(
     const page_load_metrics::PageLoadTiming& timing,
     const page_load_metrics::PageLoadExtraInfo& info) {
   DCHECK_GE(network_bytes_, 0);
   DCHECK_GE(cache_bytes_, 0);
   int64_t total_bytes = network_bytes_ + cache_bytes_;
 
   PAGE_BYTES_HISTOGRAM(internal::kHistogramNetworkBytes, network_bytes_);
@@ skipping 43 matching lines @@
                                  std::move(sample));
   }
 
   // Log the eTLD+1 of sites that did not report first meaningful paint.
   if (timing.first_paint && !timing.first_meaningful_paint) {
     rappor::SampleDomainAndRegistryFromGURL(
         rappor_service,
         internal::kRapporMetricsNameFirstMeaningfulPaintNotRecorded, info.url);
   }
 }