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

tools/perf/metrics/startup_metric.py

 # 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.
 import collections
 import json
 import logging
 
 from telemetry.core import exceptions
 from telemetry.value import histogram_util
 from telemetry.value import scalar
 
 from metrics import Metric
 
 
 class StartupMetric(Metric):
   "A metric for browser startup time."
 
   # Seconds to wait for page loading complete.
   DEFAULT_LOADING_TIMEOUT = 90
 
   HISTOGRAMS_TO_RECORD = {
     'messageloop_start_time' :
         'Startup.BrowserMessageLoopStartTimeFromMainEntry',
     'window_display_time' : 'Startup.BrowserWindowDisplay',
     'open_tabs_time' : 'Startup.BrowserOpenTabs',
-    'first_non_empty_paint_time' : 'Startup.FirstWebContents.NonEmptyPaint',
-    'first_main_frame_load_time' : 'Startup.FirstWebContents.MainFrameLoad'}
+    'first_non_empty_paint_time' : 'Startup.FirstWebContents.NonEmptyPaint2',
+    'first_main_frame_load_time' : 'Startup.FirstWebContents.MainFrameLoad2'}
 
   def Start(self, page, tab):
     raise NotImplementedError()
 
   def Stop(self, page, tab):
     raise NotImplementedError()
 
   def _GetBrowserMainEntryTime(self, tab):
     """Returns the main entry time (in ms) of the browser."""
     histogram_type = histogram_util.BROWSER_HISTOGRAM
@@ skipping 81 matching lines @@
 
       results.AddValue(scalar.ScalarValue(
           results.current_page, display_name, 'ms', measured_time))
 
     # Get tab load times.
     browser_main_entry_time_ms = self._GetBrowserMainEntryTime(tab)
     if browser_main_entry_time_ms is None:
       print "Outdated Chrome version, browser main entry time not supported."
       return
     self._RecordTabLoadTimes(tab, browser_main_entry_time_ms, results)