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

components/startup_metric_utils/startup_metric_utils.cc

 // Copyright 2013 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/startup_metric_utils/startup_metric_utils.h"
 
 #include "base/containers/hash_tables.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 410 matching lines @@
 
 void RecordFirstWebContentsMainFrameLoad(const base::Time& time) {
   static bool is_first_call = true;
   if (!is_first_call || time.is_null())
     return;
   is_first_call = false;
   if (WasNonBrowserUIDisplayed() || g_process_creation_time.Get().is_null())
     return;
 
   UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE(
+      UMA_HISTOGRAM_LONG_TIMES_100, "Startup.FirstWebContents.MainFrameLoad2",
+      g_process_creation_time.Get(), time);
+}
+
+void RecordDeprecatedFirstWebContentsMainFrameLoad(const base::Time& time) {
+  static bool is_first_call = true;
+  if (!is_first_call || time.is_null())
+    return;
+  is_first_call = false;
+  if (WasNonBrowserUIDisplayed() || g_process_creation_time.Get().is_null())
+    return;
+
+  UMA_HISTOGRAM_WITH_STARTUP_TEMPERATURE(
       UMA_HISTOGRAM_LONG_TIMES_100, "Startup.FirstWebContents.MainFrameLoad",
-      g_process_creation_time.Get(), time);
+      time - g_process_creation_time.Get());
 }
 
 void RecordFirstWebContentsNonEmptyPaint(const base::Time& time) {
   static bool is_first_call = true;
   if (!is_first_call || time.is_null())
     return;
   is_first_call = false;
   if (WasNonBrowserUIDisplayed() || g_process_creation_time.Get().is_null())
     return;
 
   UMA_HISTOGRAM_AND_TRACE_WITH_STARTUP_TEMPERATURE(
+      UMA_HISTOGRAM_LONG_TIMES_100, "Startup.FirstWebContents.NonEmptyPaint2",
+      g_process_creation_time.Get(), time);
+}
+
+void RecordDeprecatedFirstWebContentsNonEmptyPaint(const base::Time& time) {
+  static bool is_first_call = true;
+  if (!is_first_call || time.is_null())
+    return;
+  is_first_call = false;
+  if (WasNonBrowserUIDisplayed() || g_process_creation_time.Get().is_null())
+    return;
+
+  UMA_HISTOGRAM_WITH_STARTUP_TEMPERATURE(
       UMA_HISTOGRAM_LONG_TIMES_100, "Startup.FirstWebContents.NonEmptyPaint",
-      g_process_creation_time.Get(), time);
+      time - g_process_creation_time.Get());
 }
 
 void RecordFirstWebContentsMainNavigationStart(const base::Time& time) {
   static bool is_first_call = true;
   if (!is_first_call || time.is_null())
     return;
   is_first_call = false;
   if (WasNonBrowserUIDisplayed() || g_process_creation_time.Get().is_null())
     return;
 
@@ skipping 19 matching lines @@
 
 base::Time MainEntryPointTime() {
   return g_main_entry_point_time.Get();
 }
 
 StartupTemperature GetStartupTemperature() {
   return g_startup_temperature;
 }
 
 }  // namespace startup_metric_utils