Split redirect delay metrics into separate histograms.

components/page_load_metrics/browser/metrics_web_contents_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 "components/page_load_metrics/browser/metrics_web_contents_observer.h"
 
 #include <algorithm>
 #include <ostream>
 #include <string>
 #include <utility>
@@ skipping 29 matching lines @@
 const char kAbortChainSizeReload[] =
     "PageLoad.Internal.ProvisionalAbortChainSize.Reload";
 const char kAbortChainSizeForwardBack[] =
     "PageLoad.Internal.ProvisionalAbortChainSize.ForwardBack";
 const char kAbortChainSizeNewNavigation[] =
     "PageLoad.Internal.ProvisionalAbortChainSize.NewNavigation";
 const char kAbortChainSizeSameURL[] =
     "PageLoad.Internal.ProvisionalAbortChainSize.SameURL";
 const char kAbortChainSizeNoCommit[] =
     "PageLoad.Internal.ProvisionalAbortChainSize.NoCommit";
-const char kClientRedirectDelayAfterPaint[] =
-    "PageLoad.Internal.ClientRedirectDelayAfterPaint";
+const char kClientRedirectFirstPaintToNavigation[] =
+    "PageLoad.Internal.ClientRedirect.FirstPaintToNavigation";
+const char kClientRedirectWithoutPaint[] =
+    "PageLoad.Internal.ClientRedirect.NavigationWithoutPaint";
 
 }  // namespace internal
 
 namespace {
 
 // Helper to allow use of Optional<> values in LOG() messages.
 std::ostream& operator<<(std::ostream& os,
                          const base::Optional<base::TimeDelta>& opt) {
   if (opt)
     os << opt.value();
@@ skipping 317 matching lines @@
 }
 
 void PageLoadTracker::OnInputEvent(const blink::WebInputEvent& event) {
   for (const auto& observer : observers_) {
     observer->OnUserInput(event);
   }
 }
 
 void PageLoadTracker::NotifyClientRedirectTo(
     const PageLoadTracker& destination) {
-  base::TimeDelta redirect_delay_after_paint;
   if (timing_.first_paint) {
     base::TimeTicks first_paint_time =
         navigation_start() + timing_.first_paint.value();
+    base::TimeDelta first_paint_to_navigation;
     if (destination.navigation_start() > first_paint_time)
-      redirect_delay_after_paint =
+      first_paint_to_navigation =
           destination.navigation_start() - first_paint_time;
+    PAGE_LOAD_HISTOGRAM(internal::kClientRedirectFirstPaintToNavigation,
+                        first_paint_to_navigation);
+  } else {
+    UMA_HISTOGRAM_BOOLEAN(internal::kClientRedirectWithoutPaint, true);
   }
-  PAGE_LOAD_HISTOGRAM(internal::kClientRedirectDelayAfterPaint,
-                      redirect_delay_after_paint);
 }
 
 bool PageLoadTracker::UpdateTiming(const PageLoadTiming& new_timing,
                                    const PageLoadMetadata& new_metadata) {
   // Throw away IPCs that are not relevant to the current navigation.
   // Two timing structures cannot refer to the same navigation if they indicate
   // that a navigation started at different times, so a new timing struct with a
   // different start time from an earlier struct is considered invalid.
   bool valid_timing_descendent =
       timing_.navigation_start.is_null() ||
@@ skipping 526 matching lines @@
     if (navigation_handle->IsSamePage() || navigation_handle->IsErrorPage())
       return false;
     const std::string& mime_type = web_contents()->GetContentsMimeType();
     if (mime_type != "text/html" && mime_type != "application/xhtml+xml")
       return false;
   }
   return true;
 }
 
 }  // namespace page_load_metrics