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

tools/perf/benchmarks/service_worker.py

 # Copyright 2014 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 page_sets
 import re
 
 from core import perf_benchmark
 
@@ skipping 133 matching lines @@
 
 
 class _ServiceWorkerMicroBenchmarkMeasurement(legacy_page_test.LegacyPageTest):
   """Record results reported by the JS microbenchmark."""
 
   def __init__(self):
     super(_ServiceWorkerMicroBenchmarkMeasurement, self).__init__()
 
   def ValidateAndMeasurePage(self, page, tab, results):
     del page  # unused
-    tab.WaitForJavaScriptCondition2('window.done', timeout=40)
-    json = tab.EvaluateJavaScript2('window.results || {}')
+    tab.WaitForJavaScriptCondition('window.done', timeout=40)
+    json = tab.EvaluateJavaScript('window.results || {}')
     for key, value in json.iteritems():
       results.AddValue(scalar.ScalarValue(
           results.current_page, key, value['units'], value['value']))
 
 
 class ServiceWorkerPerfTest(perf_benchmark.PerfBenchmark):
   """Performance test of pages using ServiceWorker.
 
   The page set contains pages like Trained to Thrill and svgomg.
   Execution time of these pages will be shown as Speed Index, and TRACE_EVENTs
@@ skipping 20 matching lines @@
   page_set = page_sets.ServiceWorkerMicroBenchmarkPageSet
 
   @classmethod
   def Name(cls):
     return 'service_worker.service_worker_micro_benchmark'
 
   @classmethod
   def ShouldDisable(cls, possible_browser):  # http://crbug.com/597656
       return (possible_browser.browser_type == 'reference' and
               possible_browser.platform.GetDeviceTypeName() == 'Nexus 5X')