[Telemetry refactor] Drop "2" from method calls to JS API

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
@@ skipping 39 matching lines @@
     return (int(high_bytes) << 32) | (int(low_bytes) << 1)
 
   def _RecordTabLoadTimes(self, tab, browser_main_entry_time_ms, results):
     """Records the tab load times for the browser. """
     TabLoadTime = collections.namedtuple(
         'TabLoadTime',
         ['request_start_ms', 'load_end_ms'])
 
     def RecordOneTab(t):
       def EvaluateInt(exp):
-        val = t.EvaluateJavaScript2(exp)
+        val = t.EvaluateJavaScript(exp)
         if not val:
           logging.warn('%s undefined', exp)
           return 0
         return int(val)
 
       try:
-        t.WaitForJavaScriptCondition2(
+        t.WaitForJavaScriptCondition(
             'window.performance.timing["loadEventEnd"] > 0',
             timeout=self.DEFAULT_LOADING_TIMEOUT)
 
         # EvaluateJavaScript(window.performance.timing) doesn't guarantee to
         # return the desired javascript object (crbug/472603). It may return an
         # empty object. However getting individual field works.
         # The behavior depends on WebKit implementation on different platforms.
         load_event_end = EvaluateInt(
             'window.performance.timing["loadEventEnd"]')
         request_start = EvaluateInt(
@@ skipping 20 matching lines @@
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'foreground_tab_load_complete', 'ms',
           foreground_tab_load_complete))
       if foreground_tab_stats.request_start_ms > 0:
         results.AddValue(scalar.ScalarValue(
             results.current_page, 'foreground_tab_request_start', 'ms',
             foreground_tab_stats.request_start_ms - browser_main_entry_time_ms))
 
   def AddResults(self, tab, results):
     for display_name, histogram_name in self.HISTOGRAMS_TO_RECORD.iteritems():
-      result = tab.EvaluateJavaScript2(
+      result = tab.EvaluateJavaScript(
           'statsCollectionController.getBrowserHistogram({{ name }})',
           name=histogram_name)
       result = json.loads(result)
       measured_time = 0
 
       if 'sum' in result:
         # For all the histograms logged here, there's a single entry so sum
         # is the exact value for that entry.
         measured_time = result['sum']
       elif 'buckets' in result:
         measured_time = (result['buckets'][0]['high'] +
                          result['buckets'][0]['low']) / 2
 
       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)