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

tools/perf/page_sets/system_health/long_running_stories.py

 # Copyright 2016 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.login_helpers import google_login
 from page_sets.system_health import platforms
 from page_sets.system_health import system_health_story
 
 from telemetry import decorators
 
@@ skipping 47 matching lines @@
 class _LongRunningGmailMobileBase(_LongRunningGmailBase):
   SUPPORTED_PLATFORMS = platforms.MOBILE_ONLY
 
   @classmethod
   def ShouldDisable(cls, possible_browser):
     # crbug.com/651198
     return possible_browser.platform.IsSvelte()
 
   def _DidLoadDocument(self, action_runner):
     # Close the "Get Inbox by Gmail" interstitial.
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.querySelector("#isppromo a") !== null')
-    action_runner.ExecuteJavaScript2(
+    action_runner.ExecuteJavaScript(
         'document.querySelector("#isppromo a").click()')
     # Wait until the UI loads.
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementById("apploadingdiv").style.height === "0px"')
 
 
 class _LongRunningGmailDesktopBase(_LongRunningGmailBase):
   SUPPORTED_PLATFORMS = platforms.DESKTOP_ONLY
 
   def _DidLoadDocument(self, action_runner):
     # Wait until the UI loads.
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementById("loading").style.display === "none"')
 
 
 @decorators.Disabled('android')  # crbug.com/657433
 class LongRunningGmailMobileForegroundStory(_LongRunningGmailMobileBase):
   NAME = 'long_running:tools:gmail-foreground'
 
 
 @decorators.Disabled('all')  # crbug.com/681839
 class LongRunningGmailDesktopForegroundStory(_LongRunningGmailDesktopBase):
   NAME = 'long_running:tools:gmail-foreground'
 
 
 @decorators.Disabled('android-webview',  # Weview does not have tabs.
                      'android')  # crbug.com/657433
 class LongRunningGmailMobileBackgroundStory(_LongRunningGmailMobileBase):
   BACKGROUND = True
   NAME = 'long_running:tools:gmail-background'
 
 
 class LongRunningGmailDesktopBackgroundStory(_LongRunningGmailDesktopBase):
   BACKGROUND = True
   NAME = 'long_running:tools:gmail-background'