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

tools/perf/page_sets/tough_pinch_zoom_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 ToughPinchZoomCasesPage(page_module.Page):
 
@@ skipping 44 matching lines @@
 
   def __init__(self, page_set):
     super(GmailPage, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     super(GmailPage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
 
 
 class GoogleCalendarPage(ToughPinchZoomCasesPage):
 
   """ Why: productivity, top google properties """
 
   def __init__(self, page_set):
     super(GoogleCalendarPage, self).__init__(
@@ skipping 193 matching lines @@
   def __init__(self):
     super(AndroidToughPinchZoomCasesPageSet, self).__init__(7.0)
 
 
 class DesktopToughPinchZoomCasesPageSet(ToughPinchZoomCasesPageSet):
 
   """ ToughPinchZoomCasesPageSet using the maximum desktop zoom level """
 
   def __init__(self):
     super(DesktopToughPinchZoomCasesPageSet, self).__init__(4.0)