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

tools/perf/page_sets/top_pages.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
 
 
 class TopPages(page_module.Page):
 
   def __init__(self, url, page_set, shared_page_state_class,
@@ skipping 41 matching lines @@
   def __init__(self, page_set,
                shared_page_state_class=shared_page_state.SharedPageState):
     super(GmailPage, self).__init__(
         url='https://mail.google.com/mail/',
         page_set=page_set,
         credentials='google',
         shared_page_state_class=shared_page_state_class)
 
   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(TopPages):
 
   """ Why: productivity, top google properties """
 
   def __init__(self, page_set,
                shared_page_state_class=shared_page_state.SharedPageState):
     super(GoogleCalendarPage, self).__init__(
         url='https://www.google.com/calendar/',
         page_set=page_set,
         credentials='google',
         shared_page_state_class=shared_page_state_class)
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleCalendarPage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navForward"]')
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         (function() {
           var elem = document.createElement('meta');
           elem.name='viewport';
           elem.content='initial-scale=1';
           document.body.appendChild(elem);
         })();''')
     action_runner.Wait(1)
 
 
 class GoogleDocPage(TopPages):
 
   """ Why: productivity, top google properties; Sample doc in the link """
 
   def __init__(self, page_set,
                shared_page_state_class=shared_page_state.SharedPageState):
     super(GoogleDocPage, self).__init__(
         # pylint: disable=line-too-long
         url='https://docs.google.com/document/d/1X-IKNjtEnx-WW5JIKRLsyhz5sbsat3mfTpAPUSX3_s4/view',
         page_set=page_set,
         name='Docs  (1 open document tab)',
         credentials='google',
         shared_page_state_class=shared_page_state_class)
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleDocPage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(2)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementsByClassName("kix-appview-editor").length')
 
 
 class GooglePlusPage(TopPages):
 
   """ Why: social; top google property; Public profile; infinite scrolls """
 
   def __init__(self, page_set,
                shared_page_state_class=shared_page_state.SharedPageState):
     super(GooglePlusPage, self).__init__(
@@ skipping 165 matching lines @@
   def __init__(self, page_set,
                shared_page_state_class=shared_page_state.SharedPageState):
     super(YahooGamesPage, self).__init__(
         url='http://games.yahoo.com',
         page_set=page_set,
         shared_page_state_class=shared_page_state_class)
 
   def RunNavigateSteps(self, action_runner):
     super(YahooGamesPage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(2)