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

tools/perf/benchmarks/oortonline.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 re
 
 import page_sets
 
 from core import perf_benchmark
 from telemetry import benchmark
 from telemetry.page import legacy_page_test
 from telemetry.value import scalar
 from telemetry.value import improvement_direction
 from telemetry.timeline import chrome_trace_category_filter
 from telemetry.timeline import chrome_trace_config
 from telemetry.web_perf import timeline_based_measurement
 
 
 class _OortOnlineMeasurement(legacy_page_test.LegacyPageTest):
 
   def __init__(self):
     super(_OortOnlineMeasurement, self).__init__()
 
   def ValidateAndMeasurePage(self, page, tab, results):
     del page  # unused
-    tab.WaitForJavaScriptCondition2('window.benchmarkFinished', timeout=1000)
-    scores = tab.EvaluateJavaScript2('window.benchmarkScore')
+    tab.WaitForJavaScriptCondition('window.benchmarkFinished', timeout=1000)
+    scores = tab.EvaluateJavaScript('window.benchmarkScore')
     for score in scores:
       valid = score['valid']
       if valid:
         results.AddValue(scalar.ScalarValue(
             results.current_page, score['name'], 'score', score['score'],
             important=True, improvement_direction=improvement_direction.UP))
 
 
 @benchmark.Disabled('android')
 class OortOnline(perf_benchmark.PerfBenchmark):
@@ skipping 64 matching lines @@
   def Name(cls):
     return 'oortonline_tbmv2'
 
   @classmethod
   def ValueCanBeAddedPredicate(cls, value, _):
     if 'memory:chrome' in value.name:
       return bool(cls._V8_AND_OVERALL_MEMORY_RE.search(value.name))
     if 'animation ' in value.name:
       return 'throughput' in value.name or 'frameTimeDiscrepancy' in value.name
     return 'v8' in value.name