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

tools/perf/page_sets/tough_energy_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 import story
 
 
 class ToughEnergyCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
@@ skipping 10 matching lines @@
 class GooglePage(ToughEnergyCasesPage):
 
   def __init__(self, url, page_set):
     super(GooglePage, self).__init__(
         url=url,
         page_set=page_set)
     self.credentials = 'google2'
 
   def RunNavigateSteps(self, action_runner):
     super(GooglePage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
 
 
 class ToughEnergyCasesPageSet(story.StorySet):
   """Pages for measuring Chrome power draw."""
 
   def __init__(self):
     super(ToughEnergyCasesPageSet, self).__init__(
         archive_data_file='data/tough_energy_cases.json',
@@ skipping 78 matching lines @@
     # self.AddStory(CodePenPage(
     #     'http://codepen.io/testificate364/debug/ckItK', self))
 
     # Why: flash video
     self.AddStory(CodePenPage(
         'http://codepen.io/testificate364/debug/slBue', self))
 
     # Why: Blank page in the foreground
     self.AddStory(CodePenPage(
         'http://codepen.io/testificate364/debug/HdIgr', self))