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

tools/perf/benchmarks/speedometer.py

 # Copyright 2014 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.
 
 """Apple's Speedometer performance benchmark.
 
 Speedometer measures simulated user interactions in web applications.
 
 The current benchmark uses TodoMVC to simulate user actions for adding,
 completing, and removing to-do items. Speedometer repeats the same actions using
@@ skipping 38 matching lines @@
     keychain_metric.KeychainMetric.CustomizeBrowserOptions(options)
 
   def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForDocumentReadyStateToBeComplete()
     iterationCount = 10
     # A single iteration on android takes ~75 seconds, the benchmark times out
     # when running for 10 iterations.
     if tab.browser.platform.GetOSName() == 'android':
       iterationCount = 3
 
-    tab.ExecuteJavaScript2("""
+    tab.ExecuteJavaScript("""
         // Store all the results in the benchmarkClient
         benchmarkClient._measuredValues = []
         benchmarkClient.didRunSuites = function(measuredValues) {
           benchmarkClient._measuredValues.push(measuredValues);
           benchmarkClient._timeValues.push(measuredValues.total);
         };
         benchmarkClient.iterationCount = {{ count }};
         startTest();
         """,
         count=iterationCount)
-    tab.WaitForJavaScriptCondition2(
+    tab.WaitForJavaScriptCondition(
         'benchmarkClient._finishedTestCount == benchmarkClient.testsCount',
         timeout=600)
     results.AddValue(list_of_scalar_values.ListOfScalarValues(
         page, 'Total', 'ms',
-        tab.EvaluateJavaScript2('benchmarkClient._timeValues'),
+        tab.EvaluateJavaScript('benchmarkClient._timeValues'),
         important=True))
 
     # Extract the timings for each suite
     for suite_name in self.enabled_suites:
       results.AddValue(list_of_scalar_values.ListOfScalarValues(
           page, suite_name, 'ms',
-          tab.EvaluateJavaScript2("""
+          tab.EvaluateJavaScript("""
               var suite_times = [];
               for(var i = 0; i < benchmarkClient.iterationCount; i++) {
                 suite_times.push(
                     benchmarkClient._measuredValues[i].tests[{{ key }}].total);
               };
               suite_times;
               """,
               key=suite_name), important=False))
     keychain_metric.KeychainMetric().AddResults(tab, results)
 
@@ skipping 28 matching lines @@
 
 
 class SpeedometerTurbo(Speedometer):
   def SetExtraBrowserOptions(self, options):
     super(SpeedometerTurbo, self).SetExtraBrowserOptions(options)
     v8_helper.EnableTurbo(options)
 
   @classmethod
   def Name(cls):
     return 'speedometer-turbo'