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

tools/perf/page_sets/tough_ad_cases.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.
 
 from page_sets import repeatable_synthesize_scroll_gesture_shared_state
 
 from telemetry.core import util
 from telemetry.page import page as page_module
 from telemetry import story
 
 
 class SwiffyPage(page_module.Page):
 
   def __init__(self, url, page_set):
     super(SwiffyPage, self).__init__(url=url, page_set=page_set,
                                      make_javascript_deterministic=False)
 
   def RunNavigateSteps(self, action_runner):
     super(SwiffyPage, self).RunNavigateSteps(action_runner)
     # Make sure the ad has finished loading.
     util.WaitFor(action_runner.tab.HasReachedQuiescence, 60)
     # Swiffy overwrites toString() to return a constant string, so "undo" that
     # here so that we don't think it has stomped over console.time.
-    action_runner.EvaluateJavaScript2(
+    action_runner.EvaluateJavaScript(
         'Function.prototype.toString = function() { return "[native code]"; }')
     # Make sure we have a reasonable viewport for mobile.
-    action_runner.EvaluateJavaScript2("""
+    action_runner.EvaluateJavaScript("""
         var meta = document.createElement("meta");
         meta.name = "viewport";
         meta.content = "width=device-width";
         document.getElementsByTagName("head")[0].appendChild(meta);
         """)
 
   def RunPageInteractions(self, action_runner):
     with action_runner.CreateInteraction('ToughAd'):
       action_runner.Wait(10)
 
@@ skipping 23 matching lines @@
           url[len('file://'):])
     else:
       url = self._url
     action_runner.tab.Navigate(url)
 
     # Wait for the page to be scrollable. Simultaneously (to reduce latency due
     # to main thread round trips),  insert a no-op touch handler on the body.
     # Most ads have touch handlers and we want to simulate the worst case of the
     # user trying to scroll the page by grabbing an ad.
     if self._wait_for_interactive_or_better:
-        action_runner.WaitForJavaScriptCondition2(
+        action_runner.WaitForJavaScriptCondition(
             '(document.readyState == "interactive" || '
             'document.readyState == "complete") &&'
             'document.body != null && '
             'document.body.scrollHeight > window.innerHeight && '
             '!document.body.addEventListener("touchstart", function() {})')
     else:
-        action_runner.WaitForJavaScriptCondition2(
+        action_runner.WaitForJavaScriptCondition(
             'document.body != null && '
             'document.body.scrollHeight > window.innerHeight && '
             '!document.body.addEventListener("touchstart", function() {})')
 
   def RunPageInteractions(self, action_runner):
     if not self._scroll:
       with action_runner.CreateInteraction('ToughAd'):
         action_runner.Wait(30)
     else:
       action_runner.RepeatableBrowserDrivenScroll(
           y_scroll_distance_ratio=self._y_scroll_distance_multiplier,
           repeat_count=9)
 
 
 class ForbesAdPage(AdPage):
 
   def __init__(self, url, page_set, scroll=False):
     # forbes.com uses a strange dynamic transform on the body element,
     # which occasionally causes us to try scrolling from outside the
     # screen. Start at the very top of the viewport to avoid this.
     super(ForbesAdPage, self).__init__(
         url=url, page_set=page_set, make_javascript_deterministic=False,
         scroll=scroll,
         wait_for_interactive_or_better=True)
 
   def RunNavigateSteps(self, action_runner):
     super(ForbesAdPage, self).RunNavigateSteps(action_runner)
     # Wait until the interstitial banner goes away.
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.location.pathname.indexOf("welcome") == -1')
 
 
 class SyntheticToughAdCasesPageSet(story.StorySet):
   """Pages for measuring rendering performance with advertising content."""
 
   def __init__(self):
     super(SyntheticToughAdCasesPageSet, self).__init__(
         archive_data_file='data/tough_ad_cases.json',
         cloud_storage_bucket=story.INTERNAL_BUCKET)
@@ skipping 89 matching lines @@
     self.AddStory(AdPage('http://androidpolice.com', self, scroll=scroll,
         wait_for_interactive_or_better=True))
 
 
 class ScrollingToughAdCasesPageSet(ToughAdCasesPageSet):
   """Pages for measuring scrolling performance with advertising content."""
 
   def __init__(self):
     super(ScrollingToughAdCasesPageSet, self).__init__(
         scroll=True)