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

tools/perf/benchmarks/dromaeo.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 json
 import math
 import os
 
 from core import perf_benchmark
 
@@ skipping 15 matching lines @@
   def CustomizeBrowserOptions(self, options):
     power.PowerMetric.CustomizeBrowserOptions(options)
 
   def WillStartBrowser(self, platform):
     self._power_metric = power.PowerMetric(platform)
 
   def DidNavigateToPage(self, page, tab):
     self._power_metric.Start(page, tab)
 
   def ValidateAndMeasurePage(self, page, tab, results):
-    tab.WaitForJavaScriptCondition2(
+    tab.WaitForJavaScriptCondition(
         'window.document.getElementById("pause") &&' +
         'window.document.getElementById("pause").value == "Run"',
         timeout=120)
 
     # Start spying on POST request that will report benchmark results, and
     # intercept result data.
-    tab.ExecuteJavaScript2("""
+    tab.ExecuteJavaScript("""
         (function() {
           var real_jquery_ajax_ = window.jQuery;
           window.results_ = "";
           window.jQuery.ajax = function(request) {
             if (request.url == "store.php") {
               window.results_ = decodeURIComponent(request.data);
               window.results_ = window.results_.substring(
                 window.results_.indexOf("=") + 1,
                 window.results_.lastIndexOf("&"));
               real_jquery_ajax_(request);
             }
           };
         })();""")
     # Starts benchmark.
-    tab.ExecuteJavaScript2('window.document.getElementById("pause").click();')
+    tab.ExecuteJavaScript('window.document.getElementById("pause").click();')
 
-    tab.WaitForJavaScriptCondition2('!!window.results_', timeout=600)
+    tab.WaitForJavaScriptCondition('!!window.results_', timeout=600)
 
     self._power_metric.Stop(page, tab)
     self._power_metric.AddResults(tab, results)
 
-    score = json.loads(tab.EvaluateJavaScript2('window.results_ || "[]"'))
+    score = json.loads(tab.EvaluateJavaScript('window.results_ || "[]"'))
 
     def Escape(k):
       chars = [' ', '.', '-', '/', '(', ')', '*']
       for c in chars:
         k = k.replace(c, '_')
       return k
 
     def AggregateData(container, key, value):
       if key not in container:
         container[key] = {'count': 0, 'sum': 0}
@@ skipping 253 matching lines @@
   """Dromaeo CSS Query jquery JavaScript benchmark.
 
   Tests traversing a DOM structure using the Prototype JavaScript Library.
   """
   tag = 'cssqueryjquery'
   query_param = 'cssquery-jquery'
 
   @classmethod
   def Name(cls):
     return 'dromaeo.cssqueryjquery'