Remove v1 of Startup.FirstWebContents.* stats deprecated in M48.

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 23 matching lines @@
     }
   }
 }
 
 FirstWebContentsProfiler::FirstWebContentsProfiler(
     content::WebContents* web_contents)
     : 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) {}
+      collected_main_navigation_finished_metric_(false) {}
 
 void FirstWebContentsProfiler::DidFirstVisuallyNonEmptyPaint() {
   if (collected_paint_metric_)
     return;
   if (startup_metric_utils::WasNonBrowserUIDisplayed()) {
     FinishedCollectingMetrics(FinishReason::ABANDON_BLOCKING_UI);
     return;
   }
 
   collected_paint_metric_ = true;
-  const base::TimeTicks now = base::TimeTicks::Now();
-  // Record the old metric unconditionally.
-  startup_metric_utils::RecordDeprecatedFirstWebContentsNonEmptyPaint(now);
-  if (!finished_)
-    startup_metric_utils::RecordFirstWebContentsNonEmptyPaint(now);
+  startup_metric_utils::RecordFirstWebContentsNonEmptyPaint(
+      base::TimeTicks::Now());
 
   metrics::TrackingSynchronizer::OnProfilingPhaseCompleted(
       metrics::ProfilerEventProto::EVENT_FIRST_NONEMPTY_PAINT);
 
   if (IsFinishedCollectingMetrics())
     FinishedCollectingMetrics(FinishReason::DONE);
 }
 
 void FirstWebContentsProfiler::DocumentOnLoadCompletedInMainFrame() {
   if (collected_load_metric_)
     return;
   if (startup_metric_utils::WasNonBrowserUIDisplayed()) {
     FinishedCollectingMetrics(FinishReason::ABANDON_BLOCKING_UI);
     return;
   }
 
   collected_load_metric_ = true;
-  const base::TimeTicks now = base::TimeTicks::Now();
-  // Record the old metric unconditionally.
-  startup_metric_utils::RecordDeprecatedFirstWebContentsMainFrameLoad(now);
-  if (!finished_)
-    startup_metric_utils::RecordFirstWebContentsMainFrameLoad(now);
+  startup_metric_utils::RecordFirstWebContentsMainFrameLoad(
+      base::TimeTicks::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) {
-  if (!finished_) {
-    UMA_HISTOGRAM_ENUMERATION("Startup.FirstWebContents.FinishReason",
+  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_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);
   }
 
-  // Continue recording deprecated v1 stats (see |finished_|) except in
-  // scenarios where stats collection was already being abandonned previously.
-  // TODO(gab): Delete right away when getting rid of |finished_|.
-  if (IsFinishedCollectingMetrics() ||
-      finish_reason == FinishReason::ABANDON_CONTENT_DESTROYED ||
-      finish_reason == FinishReason::ABANDON_BLOCKING_UI) {
-    delete this;
-  }
+  delete this;
 }
 
 #endif  // !defined(OS_ANDROID)