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

tools/perf/page_sets/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.
 
 from page_sets import webgl_supported_shared_state
 from telemetry import page as page_module
 from telemetry import story
 
 STARTUP_SCRIPT = '''
     window.benchmarkStarted =false;
@@ skipping 34 matching lines @@
       cloud_storage_bucket=story.PARTNER_BUCKET)
     self.AddStory(OortOnlinePage(self))
 
 class OortOnlineTBMPage(OortOnlinePage):
   def __init__(self, page_set):
     super(OortOnlineTBMPage, self).__init__(page_set=page_set)
 
   def RunPageInteractions(self, action_runner):
     WAIT_TIME_IN_SECONDS = 2
     RUN_TIME_IN_SECONDS = 20
-    action_runner.WaitForJavaScriptCondition2('window.benchmarkStarted')
+    action_runner.WaitForJavaScriptCondition('window.benchmarkStarted')
     # Perform GC to get rid of start-up garbage.
     action_runner.ForceGarbageCollection()
     with action_runner.CreateInteraction('Begin'):
       action_runner.tab.browser.DumpMemory()
     # Skip the first few seconds to get more stable frame times.
     action_runner.Wait(WAIT_TIME_IN_SECONDS)
     with action_runner.CreateInteraction('Running'):
       # We cannot wait until benchmarkFinished because true because the result
       # screen does not update, which affects frame-time discrepancy
       # computation. Instead we stop based on timer.
       action_runner.Wait(RUN_TIME_IN_SECONDS)
     with action_runner.CreateInteraction('End'):
       action_runner.tab.browser.DumpMemory()
 
 class OortOnlineTBMPageSet(story.StorySet):
   """Oort Online WebGL benchmark for TBM.
   URL: http://oortonline.gl/#run
   Info: http://v8project.blogspot.de/2015/10/jank-busters-part-one.html
   """
 
   def __init__(self):
     super(OortOnlineTBMPageSet, self).__init__(
       archive_data_file='data/oortonline.json',
       cloud_storage_bucket=story.PARTNER_BUCKET)
     self.AddStory(OortOnlineTBMPage(self))