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

tools/perf/benchmarks/sunspider.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 collections
 import json
 import os
 
 from core import perf_benchmark
 
 from telemetry import page as page_module
@@ skipping 73 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.location.pathname.indexOf("results.html") >= 0'
         '&& typeof(output) != "undefined"', timeout=300)
 
     self._power_metric.Stop(page, tab)
     self._power_metric.AddResults(tab, results)
 
-    js_results = json.loads(tab.EvaluateJavaScript2('JSON.stringify(output);'))
+    js_results = json.loads(tab.EvaluateJavaScript('JSON.stringify(output);'))
 
     # Below, r is a map of benchmark names to lists of result numbers,
     # and totals is a list of totals of result numbers.
     # js_results is: formatted like this:
     # [
     #   {'3d-cube': v1, '3d-morph': v2, ...},
     #   {'3d-cube': v3, '3d-morph': v4, ...},
     #   ...
     # ]
     r = collections.defaultdict(list)
@@ skipping 26 matching lines @@
     return 'sunspider'
 
   def CreateStorySet(self, options):
     ps = story.StorySet(
         archive_data_file='../page_sets/data/sunspider.json',
         base_dir=os.path.dirname(os.path.abspath(__file__)),
         cloud_storage_bucket=story.PARTNER_BUCKET)
     ps.AddStory(page_module.Page(
         _URL, ps, ps.base_dir, make_javascript_deterministic=False))
     return ps