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

tools/perf/benchmarks/octane.py

 # Copyright 2012 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 Octane 2.0 javascript benchmark.
 
 Octane 2.0 is a modern benchmark that measures a JavaScript engine's performance
 by running a suite of tests representative of today's complex and demanding web
 applications. Octane's goal is to measure the performance of JavaScript code
 found in large, real-world web applications.
@@ skipping 81 matching lines @@
           __results.push(msg);
           __real_log.apply(this, [msg]);
         }
         skipBenchmarks = [%s]
         """ % (skipBenchmarks)
 
   def DidNavigateToPage(self, page, tab):
     self._power_metric.Start(page, tab)
 
   def ValidateAndMeasurePage(self, page, tab, results):
-    tab.WaitForJavaScriptCondition2('window.completed', timeout=10)
-    tab.WaitForJavaScriptCondition2(
+    tab.WaitForJavaScriptCondition('window.completed', timeout=10)
+    tab.WaitForJavaScriptCondition(
         '!document.getElementById("progress-bar-container")', timeout=1200)
 
     self._power_metric.Stop(page, tab)
     self._power_metric.AddResults(tab, results)
 
-    results_log = tab.EvaluateJavaScript2('__results')
+    results_log = tab.EvaluateJavaScript('__results')
     all_scores = []
     for output in results_log:
       # Split the results into score and test name.
       # results log e.g., "Richards: 18343"
       score_and_name = output.split(': ', 2)
       assert len(score_and_name) == 2, \
         'Unexpected result format "%s"' % score_and_name
       if 'Skipped' not in score_and_name[1]:
         name = score_and_name[0]
         score = float(score_and_name[1])
@@ skipping 24 matching lines @@
 
   def CreateStorySet(self, options):
     ps = story.StorySet(
         archive_data_file='../page_sets/data/octane.json',
         base_dir=os.path.dirname(os.path.abspath(__file__)),
         cloud_storage_bucket=story.PUBLIC_BUCKET)
     ps.AddStory(page_module.Page(
         'http://chromium.github.io/octane/index.html?auto=1',
         ps, ps.base_dir, make_javascript_deterministic=False))
     return ps