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

tools/perf/benchmarks/kraken.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 Mozilla's Kraken JavaScript benchmark."""
 
 import json
 import os
 
 from core import perf_benchmark
@@ skipping 68 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(
         'document.title.indexOf("Results") != -1', timeout=700)
     tab.WaitForDocumentReadyStateToBeComplete()
 
     self._power_metric.Stop(page, tab)
     self._power_metric.AddResults(tab, results)
 
-    result_dict = json.loads(tab.EvaluateJavaScript2("""
+    result_dict = json.loads(tab.EvaluateJavaScript("""
         var formElement = document.getElementsByTagName("input")[0];
         decodeURIComponent(formElement.value.split("?")[1]);
         """))
     total = 0
     for key in result_dict:
       if key == 'v':
         continue
       results.AddValue(list_of_scalar_values.ListOfScalarValues(
           results.current_page, key, 'ms', result_dict[key], important=False,
           description=DESCRIPTIONS.get(key)))
@@ skipping 25 matching lines @@
         base_dir=os.path.dirname(os.path.abspath(__file__)),
         cloud_storage_bucket=story.PARTNER_BUCKET)
     ps.AddStory(page_module.Page(
         'http://krakenbenchmark.mozilla.org/kraken-1.1/driver.html',
         ps, ps.base_dir))
     return ps
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     return cls.IsSvelte(possible_browser)  # http://crbug.com/624411