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

tools/perf/benchmarks/robohornet_pro.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 Microsoft's RoboHornet Pro benchmark."""
 
 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.ExecuteJavaScript2('ToggleRoboHornet()')
-    tab.WaitForJavaScriptCondition2(
+    tab.ExecuteJavaScript('ToggleRoboHornet()')
+    tab.WaitForJavaScriptCondition(
         'document.getElementById("results").innerHTML.indexOf("Total") != -1',
         timeout=600)
 
     self._power_metric.Stop(page, tab)
     self._power_metric.AddResults(tab, results)
 
-    result = int(tab.EvaluateJavaScript2('stopTime - startTime'))
+    result = int(tab.EvaluateJavaScript('stopTime - startTime'))
     results.AddValue(
         scalar.ScalarValue(results.current_page, 'Total', 'ms', result))
 
 
 # We plan to remove this test because it doesn't give useful data, but
 # we need to wait until Chrome OS can implement support for more helpful
 # benchmarks.
 @benchmark.Enabled('chromeos')
 class RobohornetPro(perf_benchmark.PerfBenchmark):
   """Milliseconds to complete the RoboHornetPro demo by Microsoft.
@@ skipping 10 matching lines @@
     ps = story.StorySet(
         archive_data_file='../page_sets/data/robohornet_pro.json',
         base_dir=os.path.dirname(os.path.abspath(__file__)),
         cloud_storage_bucket=story.PARTNER_BUCKET)
     ps.AddStory(page_module.Page(
         'http://ie.microsoft.com/testdrive/performance/robohornetpro/',
         ps, ps.base_dir,
         # Measurement require use of real Date.now() for measurement.
         make_javascript_deterministic=False))
     return ps