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

tools/perf/page_sets/key_desktop_sites.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 KeyDesktopSitesPage(page_module.Page):
 
   def __init__(self, url, page_set):
@@ skipping 27 matching lines @@
       function(callback) {
         gmonkey.load('2.0', function(api) {
           callback(api.getScrollableElement());
         });
       }'''
     self.credentials = 'google'
 
   def RunPageInteractions(self, action_runner):
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage()
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined && '
         'document.getElementById("gb") !== null')
 
 
 class GoogleCalendarPage(KeyDesktopSitesPage):
 
   def __init__(self, page_set):
     super(GoogleCalendarPage, self).__init__(
       url='https://www.google.com/calendar/',
       page_set=page_set)
@@ skipping 14 matching lines @@
 
     self.scrollable_element_function = '''
       function(callback) {
         callback(document.getElementsByClassName('doclistview-list')[0]);
       }'''
     self.credentials = 'google'
 
   def RunPageInteractions(self, action_runner):
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage()
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementsByClassName("doclistview-list").length')
 
 
 class GoogleDocPage(KeyDesktopSitesPage):
 
   def __init__(self, page_set):
     super(GoogleDocPage, self).__init__(
       # pylint: disable=line-too-long
       url='https://docs.google.com/a/google.com/document/d/1XMAtPiVFZfItsMUOYl39v5YA8bcSPe4LDrVO25OdsCU/edit',
       page_set=page_set)
 
     self.scrollable_element_function = '''
       function(callback) {
         callback(document.getElementsByClassName('kix-appview-editor')[0]);
       }'''
     self.credentials = 'google'
 
   def RunPageInteractions(self, action_runner):
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage()
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementsByClassName("kix-appview-editor").length')
 
 
 class KeyDesktopSitesPageSet(story.StorySet):
 
   """ Sites of Interest """
 
   def __init__(self):
     super(KeyDesktopSitesPageSet, self).__init__(
       archive_data_file='data/key_desktop_sites.json',
@@ skipping 721 matching lines @@
        '&q=black%20screen%20amd&colspec=ID%20Pri%20Mstone%20ReleaseBlock%20OS'
        '%20Area%20Feature%20Status%20Owner%20Summary'),
       'http://mlb.mlb.com/index.jsp',
       'http://www.nfl.com/',
       'http://airbnb.github.com/infinity/demo-on.html',
       'http://habrahabr.ru/post/149892/#habracut'
     ]
 
     for url in urls_list:
       self.AddStory(KeyDesktopSitesPage(url, self))