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

tools/perf/page_sets/key_silk_cases.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 KeySilkCasesPage(page_module.Page):
 
@@ skipping 346 matching lines @@
   def __init__(self, page_set, run_no_page_interactions):
     super(Page19, self).__init__(
       url='file://key_silk_cases/inbox_app.html?slide_drawer',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def ToggleDrawer(self, action_runner):
     with action_runner.CreateGestureInteraction('TapAction'):
       action_runner.TapElement('#menu-button')
 
     with action_runner.CreateInteraction('Wait'):
-      action_runner.WaitForJavaScriptCondition2('''
+      action_runner.WaitForJavaScriptCondition('''
           document.getElementById("nav-drawer").active &&
           document.getElementById("nav-drawer").children[0]
               .getBoundingClientRect().left == 0''')
 
   def RunNavigateSteps(self, action_runner):
     super(Page19, self).RunNavigateSteps(action_runner)
     action_runner.Wait(2)
     self.ToggleDrawer(action_runner)
 
   def PerformPageInteractions(self, action_runner):
     self.SlideDrawer(action_runner)
 
   def SlideDrawer(self, action_runner):
     with action_runner.CreateInteraction('Action_SwipeAction'):
       action_runner.SwipeElement(
           left_start_ratio=0.8, top_start_ratio=0.2,
           direction='left', distance=200,
           element_function='document.getElementById("nav-drawer").children[0]')
-      action_runner.WaitForJavaScriptCondition2(
+      action_runner.WaitForJavaScriptCondition(
           '!document.getElementById("nav-drawer").active')
 
 
 class Page20(KeySilkCasesPage):
 
   """ Why: Shadow DOM infinite scrolling. """
 
   def __init__(self, page_set, run_no_page_interactions):
     super(Page20, self).__init__(
       url='file://key_silk_cases/infinite_scrolling.html',
@@ skipping 14 matching lines @@
 
   def ExpandKnowledgeCard(self, action_runner):
     # expand card
     with action_runner.CreateInteraction('Action_TapAction'):
       action_runner.TapElement(
           element_function='document.getElementsByClassName("vk_arc")[0]')
       action_runner.Wait(2)
 
   def ScrollKnowledgeCardToTop(self, action_runner, card_id):
     # scroll until the knowledge card is at the top
-    action_runner.ExecuteJavaScript2(
+    action_runner.ExecuteJavaScript(
         "document.getElementById({{ card_id }}).scrollIntoView()",
         card_id=card_id)
 
   def PerformPageInteractions(self, action_runner):
     self.ExpandKnowledgeCard(action_runner)
 
 
 class GwsGoogleExpansion(GwsExpansionPage):
 
   """ Why: Animating height of a complex content card is common. """
@@ skipping 26 matching lines @@
 
   def __init__(self, page_set, run_no_page_interactions):
     super(Page22, self).__init__(
       url='http://plus.google.com/app/basic/stream',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     super(Page22, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementsByClassName("fHa").length > 0')
     action_runner.Wait(2)
 
   def PerformPageInteractions(self, action_runner):
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollElement(selector='#mainContent')
 
 
 class Page23(KeySilkCasesPage):
 
@@ skipping 25 matching lines @@
   Why: Google News: this iOS version is slower than accelerated scrolling
   """
 
   def __init__(self, page_set, run_no_page_interactions):
     super(Page24, self).__init__(
       url='http://mobile-news.sandbox.google.com/news/pt0?scroll',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def RunNavigateSteps(self, action_runner):
     super(Page24, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementById(":h") != null')
     action_runner.Wait(1)
 
   def PerformPageInteractions(self, action_runner):
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollElement(
           element_function='document.getElementById(":5")',
           distance=2500,
           use_touch=True)
 
 
 class Page25(KeySilkCasesPage):
 
   def __init__(self, page_set, run_no_page_interactions):
     super(Page25, self).__init__(
       url='http://mobile-news.sandbox.google.com/news/pt0?swipe',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def RunNavigateSteps(self, action_runner):
     super(Page25, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementById(":h") != null')
     action_runner.Wait(1)
 
   def PerformPageInteractions(self, action_runner):
     with action_runner.CreateGestureInteraction('SwipeAction', repeatable=True):
       action_runner.SwipeElement(
           direction='left', distance=100,
           element_function='document.getElementById(":f")')
     with action_runner.CreateGestureInteraction('SwipeAction', repeatable=True):
       action_runner.Wait(1)
 
 
 class Page26(KeySilkCasesPage):
 
   """ Why: famo.us twitter demo """
 
   def __init__(self, page_set, run_no_page_interactions):
     super(Page26, self).__init__(
       url='http://s.codepen.io/befamous/fullpage/pFsqb?scroll',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def RunNavigateSteps(self, action_runner):
     super(Page26, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementsByClassName("tweet").length > 0')
     action_runner.Wait(1)
 
   def PerformPageInteractions(self, action_runner):
     # Add a touch-action: none because this page prevent defaults all
     # touch moves.
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         var style = document.createElement("style");
         document.head.appendChild(style);
         style.sheet.insertRule("body { touch-action: none }", 0);
         ''')
     with action_runner.CreateGestureInteraction('ScrollAction'):
       action_runner.ScrollPage(distance=5000)
 
 
 class SVGIconRaster(KeySilkCasesPage):
 
   """ Why: Mutating SVG icons; these paint storm and paint slowly. """
 
   def __init__(self, page_set, run_no_page_interactions):
     super(SVGIconRaster, self).__init__(
       url='http://wiltzius.github.io/shape-shifter/',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def RunNavigateSteps(self, action_runner):
     super(SVGIconRaster, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'loaded = true')
     action_runner.Wait(1)
 
   def PerformPageInteractions(self, action_runner):
     for i in xrange(9):
       button_func = ('document.getElementById("demo").$.'
                      'buttons.children[%d]') % i
       with action_runner.CreateInteraction('Action_TapAction', repeatable=True):
         action_runner.TapElement(element_function=button_func)
         action_runner.Wait(1)
 
 
 class UpdateHistoryState(KeySilkCasesPage):
 
   """ Why: Modern apps often update history state, which currently is janky."""
 
   def __init__(self, page_set, run_no_page_interactions):
     super(UpdateHistoryState, self).__init__(
       url='file://key_silk_cases/pushState.html',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def RunNavigateSteps(self, action_runner):
     super(UpdateHistoryState, self).RunNavigateSteps(action_runner)
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         window.requestAnimationFrame(function() {
             window.__history_state_loaded = true;
           });
         ''')
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.__history_state_loaded == true;')
 
   def PerformPageInteractions(self, action_runner):
     with action_runner.CreateInteraction('animation_interaction'):
       action_runner.Wait(5) # JS runs the animation continuously on the page
 
 
 class SilkFinance(KeySilkCasesPage):
 
   """ Why: Some effects repaint the page, possibly including plenty of text. """
@@ skipping 15 matching lines @@
   def __init__(self, page_set, run_no_page_interactions):
     super(PolymerTopeka, self).__init__(
       url='https://polymer-topeka.appspot.com/',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def PerformPageInteractions(self, action_runner):
     profile = 'html /deep/ topeka-profile /deep/ '
     first_name = profile + 'paper-input#first /deep/ input'
     action_runner.WaitForElement(selector=first_name)
     # Input First Name:
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         var fn = document.querySelector({{ first_name }});
         fn.value = 'Chrome';
         fn.fire('input');''',
         first_name=first_name)
     # Input Last Initial:
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         var li = document.querySelector({{ selector }});
         li.value = 'E';
         li.fire('input');''',
         selector='%s paper-input#last /deep/ input' % profile)
     with action_runner.CreateInteraction('animation_interaction'):
       # Click the check-mark to login:
-      action_runner.ExecuteJavaScript2('''
+      action_runner.ExecuteJavaScript('''
           window.topeka_page_transitions = 0;
           [].forEach.call(document.querySelectorAll(
               'html /deep/ core-animated-pages'), function(p){
                   p.addEventListener(
                       'core-animated-pages-transition-end', function(e) {
                           window.topeka_page_transitions++;
                       });
               });
           document.querySelector({{ selector }}).fire('tap')''',
           selector='%s paper-fab' % profile)
       # Wait for category list to animate in:
-      action_runner.WaitForJavaScriptCondition2('''
+      action_runner.WaitForJavaScriptCondition('''
           window.topeka_page_transitions === 1''')
       # Click a category to start a quiz:
-      action_runner.ExecuteJavaScript2('''
+      action_runner.ExecuteJavaScript('''
           document.querySelector('\
               html /deep/ core-selector.category-list').fire(
               'tap',1,document.querySelector('html /deep/ \
                       div.category-item.red-theme'));''')
       # Wait for the category splash to animate in:
-      action_runner.WaitForJavaScriptCondition2('''
+      action_runner.WaitForJavaScriptCondition('''
           window.topeka_page_transitions === 2''')
       # Click to start the quiz:
-      action_runner.ExecuteJavaScript2('''
+      action_runner.ExecuteJavaScript('''
           document.querySelector('html /deep/ topeka-category-front-page /deep/\
               paper-fab').fire('tap');''')
-      action_runner.WaitForJavaScriptCondition2('''
+      action_runner.WaitForJavaScriptCondition('''
           window.topeka_page_transitions === 4''')
       # Input a mostly correct answer:
-      action_runner.ExecuteJavaScript2('''
+      action_runner.ExecuteJavaScript('''
           document.querySelector('html /deep/ topeka-quiz-fill-blank /deep/\
               input').value = 'arkinsaw';
           document.querySelector('html /deep/ topeka-quiz-fill-blank /deep/\
               input').fire('input');
           document.querySelector('html /deep/ topeka-quizzes /deep/ \
               paper-fab').fire('tap');''')
-      action_runner.WaitForJavaScriptCondition2('''
+      action_runner.WaitForJavaScriptCondition('''
           window.topeka_page_transitions === 6''')
 
 class Masonry(KeySilkCasesPage):
 
   """ Why: Popular layout hack. """
 
   def __init__(self, page_set, run_no_page_interactions):
     super(Masonry, self).__init__(
       url='file://key_silk_cases/masonry.html',
       page_set=page_set, run_no_page_interactions=run_no_page_interactions)
 
   def PerformPageInteractions(self, action_runner):
     with action_runner.CreateInteraction('animation_interaction'):
-      action_runner.ExecuteJavaScript2('window.brick()')
-      action_runner.WaitForJavaScriptCondition2('window.done')
+      action_runner.ExecuteJavaScript('window.brick()')
+      action_runner.WaitForJavaScriptCondition('window.done')
 
 
 class KeySilkCasesPageSet(story.StorySet):
 
   """ Pages hand-picked for project Silk. """
 
   def __init__(self, run_no_page_interactions=False):
     super(KeySilkCasesPageSet, self).__init__(
       archive_data_file='data/key_silk_cases.json',
       cloud_storage_bucket=story.PARTNER_BUCKET)
@@ skipping 32 matching lines @@
     self.AddStory(SilkFinance(self, run_no_page_interactions))
     # Flaky interaction steps on Android; crbug.com/507865
     # self.AddStory(PolymerTopeka(self, run_no_page_interactions))
     self.AddStory(Masonry(self, run_no_page_interactions))
 
     for page in self:
       assert (page.__class__.RunPageInteractions ==
               KeySilkCasesPage.RunPageInteractions), (
               'Pages in this page set must not override KeySilkCasesPage\' '
               'RunPageInteractions method.')