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

tools/perf/page_sets/top_7_stress.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
 
 
 def _GetCurrentLocation(action_runner):
-  return action_runner.EvaluateJavaScript2('document.location.href')
+  return action_runner.EvaluateJavaScript('document.location.href')
 
 
 def _WaitForLocationChange(action_runner, old_href):
-  action_runner.WaitForJavaScriptCondition2(
+  action_runner.WaitForJavaScriptCondition(
       'document.location.href != {{ old_href }}', old_href=old_href)
 
 
 class Top7StressPage(page_module.Page):
 
   def __init__(self, url, page_set, name=''):
     super(Top7StressPage, self).__init__(
         url=url, page_set=page_set, name=name,
         shared_page_state_class=shared_page_state.SharedDesktopPageState,
         credentials_path = 'data/credentials.json')
@@ skipping 67 matching lines @@
 
   def __init__(self, page_set):
     super(GmailPage, self).__init__(
       url='https://mail.google.com/mail/',
       page_set=page_set)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     super(GmailPage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
 
   def RunPageInteractions(self, action_runner):
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(
         'a[href="https://mail.google.com/mail/u/0/?shva=1#starred"]')
     _WaitForLocationChange(action_runner, old_href)
     old_href = _GetCurrentLocation(action_runner)
     action_runner.ClickElement(
         'a[href="https://mail.google.com/mail/u/0/?shva=1#inbox"]')
     _WaitForLocationChange(action_runner, old_href)
 
 
 class GoogleCalendarPage(Top7StressPage):
 
   """ Why: productivity, top google properties """
 
   def __init__(self, page_set):
     super(GoogleCalendarPage, self).__init__(
       url='https://www.google.com/calendar/',
       page_set=page_set)
 
     self.credentials = 'google'
 
   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)
 
   def RunPageInteractions(self, action_runner):
     action_runner.ClickElement('div[class~="navForward"]')
@@ skipping 145 matching lines @@
     self.credentials = 'facebook2'
 
   def RunNavigateSteps(self, action_runner):
     super(FacebookPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForElement(text='About')
 
   def RunPageInteractions(self, action_runner):
     # Scroll and wait for the next page to be loaded.
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage()
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.documentElement.scrollHeight - window.innerHeight - '
         'window.pageYOffset > 0')
 
     # Scroll and wait again.
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage()
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.documentElement.scrollHeight - window.innerHeight - '
         'window.pageYOffset > 0')
 
 class Top7StressPageSet(story.StorySet):
 
   """ Pages hand-picked for stress testing. """
 
   def __init__(self):
     super(Top7StressPageSet, self).__init__(
       archive_data_file='data/top_7_stress.json',
       cloud_storage_bucket=story.PARTNER_BUCKET)
 
     self.AddStory(GoogleWebSearchPage(self))
     self.AddStory(GmailPage(self))
     self.AddStory(GoogleCalendarPage(self))
     self.AddStory(GooglePlusPage(self))
     self.AddStory(BlogspotPage(self))
     self.AddStory(WordpressPage(self))
     self.AddStory(FacebookPage(self))