Move new Startup.FirstWebContents.* stats to Startup.FirstWebContents.*2.

chrome/browser/metrics/first_web_contents_profiler.cc

 // Copyright 2014 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.
 
 #if !defined(OS_ANDROID)
 
 #include "chrome/browser/metrics/first_web_contents_profiler.h"
 
 #include <string>
 
@@ skipping 104 matching lines @@
 }
 
 FirstWebContentsProfiler::FirstWebContentsProfiler(
     content::WebContents* web_contents,
     Delegate* delegate)
     : content::WebContentsObserver(web_contents),
       collected_paint_metric_(false),
       collected_load_metric_(false),
       collected_main_navigation_start_metric_(false),
       collected_main_navigation_finished_metric_(false),
+      finished_(false),
       delegate_(delegate),
       responsiveness_histogram_(NULL),
       responsiveness_1sec_histogram_(NULL),
       responsiveness_10sec_histogram_(NULL),
       unresponsiveness_histogram_(NULL),
       unresponsiveness_1sec_histogram_(NULL),
       unresponsiveness_10sec_histogram_(NULL) {
   InitHistograms();
 }
 
 void FirstWebContentsProfiler::DidFirstVisuallyNonEmptyPaint() {
   if (collected_paint_metric_)
     return;
   if (startup_metric_utils::WasNonBrowserUIDisplayed()) {
     FinishedCollectingMetrics(FinishReason::ABANDON_BLOCKING_UI);
     return;
   }
 
   collected_paint_metric_ = true;
-  startup_metric_utils::RecordFirstWebContentsNonEmptyPaint(base::Time::Now());
+  const base::Time now = base::Time::Now();
+  // Record the old metric unconditionally.
+  startup_metric_utils::RecordDeprecatedFirstWebContentsNonEmptyPaint(now);
+  if (!finished_)
+    startup_metric_utils::RecordFirstWebContentsNonEmptyPaint(now);
 
   metrics::TrackingSynchronizer::OnProfilingPhaseCompleted(
       metrics::ProfilerEventProto::EVENT_FIRST_NONEMPTY_PAINT);
 
   // Measures responsiveness now.
   MeasureUIResponsiveness(responsiveness_histogram_,
                           unresponsiveness_histogram_);
 
   // As it was observed that sometimes the task queue can be free immediately
   // after the first paint but get overloaded shortly thereafter, here we
@@ skipping 17 matching lines @@
 
 void FirstWebContentsProfiler::DocumentOnLoadCompletedInMainFrame() {
   if (collected_load_metric_)
     return;
   if (startup_metric_utils::WasNonBrowserUIDisplayed()) {
     FinishedCollectingMetrics(FinishReason::ABANDON_BLOCKING_UI);
     return;
   }
 
   collected_load_metric_ = true;
-  startup_metric_utils::RecordFirstWebContentsMainFrameLoad(base::Time::Now());
+  const base::Time now = base::Time::Now();
+  // Record the old metric unconditionally.
+  startup_metric_utils::RecordDeprecatedFirstWebContentsMainFrameLoad(now);
+  if (!finished_)
+    startup_metric_utils::RecordFirstWebContentsMainFrameLoad(now);
 
   if (IsFinishedCollectingMetrics())
     FinishedCollectingMetrics(FinishReason::DONE);
 }
 
 void FirstWebContentsProfiler::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   if (collected_main_navigation_start_metric_)
     return;
   if (startup_metric_utils::WasNonBrowserUIDisplayed()) {
@@ skipping 54 matching lines @@
 void FirstWebContentsProfiler::WebContentsDestroyed() {
   FinishedCollectingMetrics(FinishReason::ABANDON_CONTENT_DESTROYED);
 }
 
 bool FirstWebContentsProfiler::IsFinishedCollectingMetrics() {
   return collected_paint_metric_ && collected_load_metric_;
 }
 
 void FirstWebContentsProfiler::FinishedCollectingMetrics(
     FinishReason finish_reason) {
-  UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason",
-                            finish_reason, FinishReason::ENUM_MAX);
-  if (!collected_paint_metric_) {
-    UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason_NoPaint",
+  if (!finished_) {
+    UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason",
                               finish_reason, FinishReason::ENUM_MAX);
+    if (!collected_paint_metric_) {
+      UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason_NoPaint",
+                                finish_reason, FinishReason::ENUM_MAX);
+    }
+    if (!collected_load_metric_) {
+      UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason_NoLoad",
+                                finish_reason, FinishReason::ENUM_MAX);
+    }
+    finished_ = true;
   }
-  if (!collected_load_metric_) {
-    UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason_NoLoad",
-                              finish_reason, FinishReason::ENUM_MAX);
-  }
-  delegate_->ProfilerFinishedCollectingMetrics();
+  // TODO(gab): Delete right away when getting rid of |finished_|.
+  if (IsFinishedCollectingMetrics())
+    delegate_->ProfilerFinishedCollectingMetrics();
 }
 
 void FirstWebContentsProfiler::InitHistograms() {
   const std::string responsiveness_histogram_name =
       "Startup.FirstWebContents.UIResponsive";
   responsiveness_histogram_ = base::Histogram::FactoryTimeGet(
       responsiveness_histogram_name, base::TimeDelta::FromMilliseconds(1),
       base::TimeDelta::FromSeconds(60), 100,
       base::Histogram::kUmaTargetedHistogramFlag);
 
@@ skipping 26 matching lines @@
       100, base::Histogram::kUmaTargetedHistogramFlag);
 
   const std::string unresponsiveness_10sec_histogram_name =
       "Startup.FirstWebContents.UINotResponsive_10sec";
   unresponsiveness_10sec_histogram_ = base::Histogram::FactoryTimeGet(
       unresponsiveness_10sec_histogram_name,
       base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromSeconds(60),
       100, base::Histogram::kUmaTargetedHistogramFlag);
 }
 #endif  // !defined(OS_ANDROID)