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

tools/perf/page_sets/key_desktop_move_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 telemetry.page import page as page_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
 
 class KeyDesktopMoveCasesPage(page_module.Page):
 
@@ skipping 18 matching lines @@
     self.scrollable_element_function = '''
       function(callback) {
         gmonkey.load('2.0', function(api) {
           callback(api.getScrollableElement());
         });
       }'''
     self.credentials = 'google'
 
   def RunNavigateSteps(self, action_runner):
     super(GmailMouseScrollPage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
     # This check is needed for gmonkey to load completely.
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.readyState == "complete"')
 
   def RunPageInteractions(self, action_runner):
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         gmonkey.load('2.0', function(api) {
           window.__scrollableElementForTelemetry = api.getScrollableElement();
         });''')
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.__scrollableElementForTelemetry != null')
     scrollbar_x, start_y, end_y = self._CalculateScrollBarRatios(action_runner)
 
     with action_runner.CreateGestureInteraction('DragAction'):
       action_runner.DragPage(left_start_ratio=scrollbar_x,
           top_start_ratio=start_y, left_end_ratio=scrollbar_x,
           top_end_ratio=end_y, speed_in_pixels_per_second=100,
           element_function='window.__scrollableElementForTelemetry')
 
   def _CalculateScrollBarRatios(self, action_runner):
-    viewport_height = float(action_runner.EvaluateJavaScript2(
+    viewport_height = float(action_runner.EvaluateJavaScript(
         'window.__scrollableElementForTelemetry.clientHeight'))
-    content_height = float(action_runner.EvaluateJavaScript2(
+    content_height = float(action_runner.EvaluateJavaScript(
         'window.__scrollableElementForTelemetry.scrollHeight'))
-    viewport_width = float(action_runner.EvaluateJavaScript2(
+    viewport_width = float(action_runner.EvaluateJavaScript(
         'window.__scrollableElementForTelemetry.offsetWidth'))
-    scrollbar_width = float(action_runner.EvaluateJavaScript2('''
+    scrollbar_width = float(action_runner.EvaluateJavaScript('''
         window.__scrollableElementForTelemetry.offsetWidth -
         window.__scrollableElementForTelemetry.scrollWidth'''))
 
     # This calculation is correct only when the element doesn't have border or
     # padding or scroll buttons (eg: gmail mail element).
     # Calculating the mid point of start of scrollbar.
     scrollbar_height_ratio = viewport_height / content_height
     scrollbar_start_mid_y = scrollbar_height_ratio / 2
     scrollbar_width_ratio = scrollbar_width / viewport_width
     scrollbar_mid_x_right_offset = scrollbar_width_ratio / 2
@@ skipping 34 matching lines @@
 
   """ Special cases for move gesture """
 
   def __init__(self):
     super(KeyDesktopMoveCasesPageSet, self).__init__(
       archive_data_file='data/key_desktop_move_cases.json',
       cloud_storage_bucket=story.PARTNER_BUCKET)
 
     self.AddStory(GmailMouseScrollPage(self))
     self.AddStory(GoogleMapsPage(self))