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

tools/perf/measurements/oilpan_gc_times.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 os
 
 from telemetry.page import legacy_page_test
 from telemetry.timeline.model import TimelineModel
 from telemetry.timeline import tracing_config
 from telemetry.value import list_of_scalar_values
@@ skipping 170 matching lines @@
     super(OilpanGCTimesForBlinkPerf, self).__init__()
     with open(os.path.join(os.path.dirname(__file__), '..', 'benchmarks',
                            'blink_perf.js'), 'r') as f:
       self._blink_perf_js = f.read()
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = self._blink_perf_js
     super(OilpanGCTimesForBlinkPerf, self).WillNavigateToPage(page, tab)
 
   def ValidateAndMeasurePage(self, page, tab, results):
-    tab.WaitForJavaScriptCondition2('testRunner.isDone', timeout=600)
+    tab.WaitForJavaScriptCondition('testRunner.isDone', timeout=600)
     super(OilpanGCTimesForBlinkPerf, self).ValidateAndMeasurePage(
         page, tab, results)
 
 
 class OilpanGCTimesForInternals(OilpanGCTimesForBlinkPerf):
 
   def __init__(self):
     super(OilpanGCTimesForInternals, self).__init__()
 
   @classmethod
   def CustomizeBrowserOptions(cls, options):
     # 'expose-internals-for-testing' can be enabled on content shell.
     assert 'content-shell' in options.browser_type
     options.AppendExtraBrowserArgs(['--expose-internals-for-testing',
                                     '--js-flags=--expose-gc'])