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

tools/perf/page_sets/top_10.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 SimplePage(page_module.Page):
   def __init__(self, url, page_set, credentials='', name=''):
@@ skipping 19 matching lines @@
 
 class Gmail(SimplePage):
   def __init__(self, page_set):
     super(Gmail, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set,
       credentials='google')
 
   def RunNavigateSteps(self, action_runner):
     super(Gmail, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
 
 
 class GoogleCalendar(SimplePage):
   def __init__(self, page_set):
     super(GoogleCalendar, self).__init__(
       url='https://www.google.com/calendar/',
       page_set=page_set,
       credentials='google')
 
   def RunNavigateSteps(self, action_runner):
     super(GoogleCalendar, self).RunNavigateSteps(action_runner)
-    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(2)
     action_runner.WaitForElement('div[class~="navForward"]')
 
 
 class Youtube(SimplePage):
@@ skipping 77 matching lines @@
     self.AddStory(GoogleCalendar(self))
     self.AddStory(Youtube(self))
     # crbug.com/662381.
     #self.AddStory(Facebook(self))
     self.AddStory(SimplePage('http://en.wikipedia.org/wiki/Wikipedia',
                                   self, name='Wikipedia'))
     self.AddStory(SimplePage('http://www.amazon.com', self))
     self.AddStory(SimplePage('http://www.yahoo.com/', self))
     self.AddStory(SimplePage('http://www.bing.com/', self))
     self.AddStory(SimplePage('http://www.ask.com/', self))