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

tools/perf/page_sets/tough_animation_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 ToughAnimationCasesPage(page_module.Page):
 
   def __init__(self, url, page_set, need_measurement_ready):
     super(ToughAnimationCasesPage, self).__init__(url=url, page_set=page_set)
     self.archive_data_file = 'data/tough_animation_cases.json'
     self._need_measurement_ready = need_measurement_ready
 
   def RunNavigateSteps(self, action_runner):
     super(ToughAnimationCasesPage, self).RunNavigateSteps(action_runner)
     if self._need_measurement_ready:
-      action_runner.WaitForJavaScriptCondition2('window.measurementReady')
+      action_runner.WaitForJavaScriptCondition('window.measurementReady')
 
   def RunPageInteractions(self, action_runner):
     with action_runner.CreateInteraction('ToughAnimation'):
       action_runner.Wait(10)
 
 class ToughAnimationCasesPageSet(story.StorySet):
 
   """
   Description: A collection of animation performance tests
   """
@@ skipping 236 matching lines @@
       'file://tough_animation_cases/mix_blend_mode_propagating_isolation.html',
 
       # Disabled: crbug.com/350692
       # Why: Login page is slow because of ineffecient transform operations.
       # 'http://ie.microsoft.com/testdrive/performance/robohornetpro/',
     ]
 
     for url in urls_list_two:
       self.AddStory(ToughAnimationCasesPage(url, self,
                                            need_measurement_ready=False))