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

tools/perf/page_sets/top_25_smooth.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
 
 from page_sets.login_helpers import google_login
 from page_sets import top_pages
 
@@ skipping 39 matching lines @@
     # legacy and new login flow.
     super(GmailSmoothPage, self).__init__(
         url='https://mail.google.com/mail/',
         page_set=page_set,
         shared_page_state_class=shared_page_state_class)
 
   def RunNavigateSteps(self, action_runner):
     google_login.LoginGoogleAccount(action_runner, 'google3',
                                     self.credentials_path)
     super(GmailSmoothPage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null',
         timeout=120)
 
   def RunPageInteractions(self, action_runner):
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         gmonkey.load('2.0', function(api) {
           window.__scrollableElementForTelemetry = api.getScrollableElement();
         });''')
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.__scrollableElementForTelemetry != null')
     action_runner.Wait(1)
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollElement(
           element_function='window.__scrollableElementForTelemetry')
 
 
 class GoogleCalendarSmoothPage(top_pages.GoogleCalendarPage):
 
   """ Why: productivity, top google properties """
@@ skipping 90 matching lines @@
       other_urls.append('http://techcrunch.com')
 
     for url in other_urls:
       self.AddStory(TopSmoothPage(url, self))
 
 
 class V8Top25SmoothPageSet(Top25SmoothPageSet):
   def __init__(self):
     # Disabled for V8 because of crbug.com/507836, crbug.com/527425
     super(V8Top25SmoothPageSet, self).__init__(techcrunch=False)