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

tools/perf/benchmarks/indexeddb_perf.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.
 
 """Runs Chromium's IndexedDB performance test. These test:
 
 Databases:
   create/delete
 Keys:
   create/delete
@@ skipping 47 matching lines @@
   def DidStartBrowser(self, browser):
     """Initialize metrics once right after the browser has been launched."""
     self._memory_metric = memory.MemoryMetric(browser)
 
   def DidNavigateToPage(self, page, tab):
     self._memory_metric.Start(page, tab)
     self._power_metric.Start(page, tab)
 
   def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForDocumentReadyStateToBeComplete()
-    tab.WaitForJavaScriptCondition2('window.done', timeout=600)
+    tab.WaitForJavaScriptCondition('window.done', timeout=600)
 
     self._power_metric.Stop(page, tab)
     self._memory_metric.Stop(page, tab)
 
     self._memory_metric.AddResults(tab, results)
     self._power_metric.AddResults(tab, results)
 
-    result_dict = json.loads(tab.EvaluateJavaScript2(
+    result_dict = json.loads(tab.EvaluateJavaScript(
         'JSON.stringify(automation.getResults());'))
     total = 0.0
     for key in result_dict:
       if key == 'OverallTestDuration':
         continue
       msec = float(result_dict[key])
       results.AddValue(scalar.ScalarValue(
           results.current_page, key, 'ms', msec, important=False))
 
       total += msec
@@ skipping 46 matching lines @@
     return timeline_based_measurement.Options(
         overhead_level=cat_filter)
 
   @classmethod
   def Name(cls):
     return 'storage.indexeddb_endure_tracing'
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, is_first_result):
     return 'idb' in value.name