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

tools/perf/page_sets/tough_scheduling_cases.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 telemetry.page import page as page_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
 
 class ToughSchedulingCasesPage(page_module.Page):
 
@@ skipping 359 matching lines @@
   def __init__(self, page_set, variant='medium'):
     super(SecondBatchJsPage, self).__init__(
         url='file://tough_scheduling_cases/second_batch_js.html?%s' % variant,
         page_set=page_set)
 
   def RunPageInteractions(self, action_runner):
     # Do a dummy tap to warm up the synthetic tap code path.
     action_runner.TapElement(selector='div[id="spinner"]')
     # Begin the action immediately because we want the page to update smoothly
     # even while resources are being loaded.
-    action_runner.WaitForJavaScriptCondition2('window.__ready !== undefined')
+    action_runner.WaitForJavaScriptCondition('window.__ready !== undefined')
 
     with action_runner.CreateGestureInteraction('LoadAction'):
-      action_runner.ExecuteJavaScript2('kickOffLoading()')
-      action_runner.WaitForJavaScriptCondition2('window.__ready')
+      action_runner.ExecuteJavaScript('kickOffLoading()')
+      action_runner.WaitForJavaScriptCondition('window.__ready')
       # Click one second after the resources have finished loading.
       action_runner.Wait(1)
       action_runner.TapElement(selector='input[id="run"]')
       # Wait for the test to complete.
-      action_runner.WaitForJavaScriptCondition2('window.__finished')
+      action_runner.WaitForJavaScriptCondition('window.__finished')
 
 
 class ToughSchedulingCasesPageSet(story.StorySet):
 
   """Tough scheduler latency test cases."""
 
   def __init__(self):
     super(ToughSchedulingCasesPageSet, self).__init__(
         archive_data_file='data/tough_scheduling_cases.json',
         cloud_storage_bucket=story.INTERNAL_BUCKET)
@@ skipping 90 matching lines @@
         desktop=True,
         slow_handler=True,
         bounce=True,
         page_set=self))
     # Why: For measuring the latency of scroll-synchronized effects.
     self.AddStory(SynchronizedScrollOffsetPage(page_set=self))
     # Why: Test loading a large amount of Javascript.
     self.AddStory(SecondBatchJsPage(page_set=self, variant='light'))
     self.AddStory(SecondBatchJsPage(page_set=self, variant='medium'))
     self.AddStory(SecondBatchJsPage(page_set=self, variant='heavy'))