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

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index e0900d8a42138f6c55ad9284792d44e40aeec6ab..adc5ec869adfd134c9525808a633a34dd9dbc012 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -44155,8 +44155,21 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>erikchen@chromium.org</owner>
   <owner>gab@chromium.org</owner>
   <summary>
+    [Desktop] DEPRECATED. Measure the elapsed time from process launch to the
+    first main frame load of the first web contents. Deprecated in favor of
+    Startup.FirstWebContents.MainFrameLoad2 which now avoids counting ill-cases
+    (ref. FirstWebContentsProfiler::FinishReason).
+  </summary>
+</histogram>
+
+<histogram name="Startup.FirstWebContents.MainFrameLoad2" units="milliseconds">
+  <owner>erikchen@chromium.org</owner>
+  <owner>gab@chromium.org</owner>
+  <summary>
     [Desktop] Measure the elapsed time from process launch to the first main
-    frame load of the first web contents.
+    frame load of the first web contents. Only comprised of cases where the
+    initial foreground tab gets to complete its rendering task unimpeded (an
+    improvement over Startup.FirstWebContents.MainFrameLoad).
   </summary>
 </histogram>
 
@@ -44183,8 +44196,21 @@ http://cs/file:chrome/histograms.xml - but prefer this file for new entries.
   <owner>erikchen@chromium.org</owner>
   <owner>gab@chromium.org</owner>
   <summary>
+    [Desktop] DEPRECATED. Measure the elapsed time from process launch to the
+    first non- empty paint of the first web contents. Deprecated in favor of
+    Startup.FirstWebContents.NonEmptyPaint2 which now avoids counting ill-cases
+    (ref. FirstWebContentsProfiler::FinishReason).
+  </summary>
+</histogram>
+
+<histogram name="Startup.FirstWebContents.NonEmptyPaint2" units="milliseconds">
+  <owner>erikchen@chromium.org</owner>
+  <owner>gab@chromium.org</owner>
+  <summary>
     [Desktop] Measure the elapsed time from process launch to the first non-
-    empty paint of the first web contents.
+    empty paint of the first web contents. Only comprised of cases where the
+    initial foreground tab gets to complete its rendering task unimpeded (an
+    improvement over Startup.FirstWebContents.NonEmptyPaint).
   </summary>
 </histogram>
 
@@ -79940,9 +79966,11 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="Startup.BrowserOpenTabs"/>
   <affected-histogram name="Startup.BrowserWindowDisplay"/>
   <affected-histogram name="Startup.FirstWebContents.MainFrameLoad"/>
+  <affected-histogram name="Startup.FirstWebContents.MainFrameLoad2"/>
   <affected-histogram name="Startup.FirstWebContents.MainNavigationFinished"/>
   <affected-histogram name="Startup.FirstWebContents.MainNavigationStart"/>
   <affected-histogram name="Startup.FirstWebContents.NonEmptyPaint"/>
+  <affected-histogram name="Startup.FirstWebContents.NonEmptyPaint2"/>
   <affected-histogram name="Startup.LoadTime.ExeMainToDllMain"/>
   <affected-histogram name="Startup.LoadTime.ProcessCreateToDllMain"/>
   <affected-histogram name="Startup.LoadTime.ProcessCreateToExeMain"/>