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

tools/perf/page_sets/blink_memory_mobile.py

 # Copyright 2015 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.
 
 import logging
 
 from telemetry.page import page as page_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
@@ skipping 29 matching lines @@
   COMMENT_LINK_SELECTOR = '.show_comments_link'
 
   def __init__(self, page_set):
     super(TheVergePage, self).__init__(
         'http://www.theverge.com/2015/8/11/9133883/taylor-swift-spotify-discover-weekly-what-is-going-on',
         page_set=page_set,
         name='TheVerge')
 
   def RunPageInteractions(self, action_runner):
     action_runner.WaitForElement(selector=TheVergePage.COMMENT_LINK_SELECTOR)
-    action_runner.ExecuteJavaScript2(
+    action_runner.ExecuteJavaScript(
         'window.location.hash = "comments"')
     action_runner.TapElement(
         selector=TheVergePage.COMMENT_LINK_SELECTOR)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.Chorus.Comments.collection.length > 0')
     super(TheVergePage, self).RunPageInteractions(action_runner)
 
 
 class FacebookPage(BlinkMemoryMobilePage):
   def __init__(self, page_set):
     super(FacebookPage, self).__init__(
         'https://facebook.com/barackobama',
         page_set=page_set,
         name='Facebook')
 
   def RunNavigateSteps(self, action_runner):
     super(FacebookPage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementById("u_0_c") !== null &&'
         'document.body.scrollHeight > window.innerHeight')
 
 
 class GmailPage(BlinkMemoryMobilePage):
   def __init__(self, page_set):
     super(GmailPage, self).__init__(
         'https://mail.google.com/mail/',
         page_set=page_set,
         name='Gmail')
 
   def RunNavigateSteps(self, action_runner):
     google_login.LoginGoogleAccount(action_runner, 'google',
                                     self.credentials_path)
     super(GmailPage, self).RunNavigateSteps(action_runner)
     action_runner.WaitForElement(selector='#apploadingdiv')
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.querySelector("#apploadingdiv").style.opacity == "0"')
 
 
 class BlinkMemoryMobilePageSet(story.StorySet):
   """Key mobile sites for Blink memory reduction."""
 
   def __init__(self):
     super(BlinkMemoryMobilePageSet, self).__init__(
         archive_data_file='data/blink_memory_mobile.json',
         cloud_storage_bucket=story.PARTNER_BUCKET)
@@ skipping 29 matching lines @@
     # Why: Key products.
     self.AddStory(GmailPage(page_set=self))
     self.AddStory(BlinkMemoryMobilePage(
         'http://googlewebmastercentral.blogspot.com/2015/04/rolling-out-mobile-friendly-update.html?m=1',
         page_set=self,
         name='Blogger'))
     self.AddStory(BlinkMemoryMobilePage(
         'https://plus.google.com/app/basic/110031535020051778989/posts?source=apppromo',
         page_set=self,
         name='GooglePlus'))