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

tools/perf/metrics/startup_metric.py

Index: tools/perf/metrics/startup_metric.py
diff --git a/tools/perf/metrics/startup_metric.py b/tools/perf/metrics/startup_metric.py
index ff07b8bd8e7f22a5e80dd24af845b6e55491e16b..463cb30d0dac5f2493b8075b5b73c6a1c3a90ce4 100644
--- a/tools/perf/metrics/startup_metric.py
+++ b/tools/perf/metrics/startup_metric.py
@@ -57,14 +57,14 @@ class StartupMetric(Metric):
 
     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)
 
@@ -105,7 +105,7 @@ class StartupMetric(Metric):
 
   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)