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

tools/perf/page_sets/key_mobile_sites_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 import key_mobile_sites_pages
 
 
@@ skipping 16 matching lines @@
                action_on_load_complete=False):
     super(KeyMobileSitesSmoothPage, self).__init__(
         url=url, page_set=page_set, name=name,
         credentials_path='data/credentials.json', tags=tags,
         shared_page_state_class=shared_page_state.SharedMobilePageState)
     self.archive_data_file = 'data/key_mobile_sites.json'
     self.action_on_load_complete = action_on_load_complete
 
   def RunPageInteractions(self, action_runner):
     if self.action_on_load_complete:
-        action_runner.WaitForJavaScriptCondition2(
+        action_runner.WaitForJavaScriptCondition(
             'document.readyState == "complete"', timeout=30)
     _IssueMarkerAndScroll(action_runner)
 
 
 class LinkedInSmoothPage(key_mobile_sites_pages.LinkedInPage):
 
   def __init__(self, page_set):
     super(LinkedInSmoothPage, self).__init__(page_set=page_set)
 
   # Linkedin has expensive shader compilation so it can benefit from shader
@@ skipping 236 matching lines @@
       ('http://www.baidu.com/s?wd=barack+obama&rsv_bp=0&rsv_spt=3&rsv_sug3=9&'
        'rsv_sug=0&rsv_sug4=3824&rsv_sug1=3&inputT=4920'),
       # Why: Top search engine
       'http://www.bing.com/search?q=sloths',
       # Why: Good example of poor initial scrolling
       'http://ftw.usatoday.com/2014/05/spelling-bee-rules-shenanigans'
     ]
 
     for url in urls_list:
       self.AddStory(KeyMobileSitesSmoothPage(url, self))