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

tools/perf/page_sets/system_health/browsing_stories.py

 # encoding: utf-8
 # 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.system_health import platforms
 from page_sets.system_health import story_tags
 from page_sets.system_health import system_health_story
 
 from page_sets.login_helpers import pinterest_login
@@ skipping 211 matching lines @@
   IS_SINGLE_PAGE_APP = True
   ITEM_SELECTOR = '.hed > a'
   SUPPORTED_PLATFORMS = platforms.MOBILE_ONLY
   _CLOSE_BUTTON_SELECTOR = '.close'
 
   def _DidLoadDocument(self, action_runner):
     # Close the popup window. On Nexus 9 (and probably other tables) the popup
     # window does not have a "Close" button, instead it has only a "Send link
     # to phone" button. So on tablets we run with the popup window open. The
     # popup is transparent, so this is mostly an aesthetical issue.
-    has_button = action_runner.EvaluateJavaScript2(
+    has_button = action_runner.EvaluateJavaScript(
         '!!document.querySelector({{ selector }})',
         selector=self._CLOSE_BUTTON_SELECTOR)
     if has_button:
       action_runner.ClickElement(selector=self._CLOSE_BUTTON_SELECTOR)
     super(WashingtonPostMobileStory, self)._DidLoadDocument(action_runner)
 
 
 ##############################################################################
 # Search browsing stories.
 ##############################################################################
@@ skipping 74 matching lines @@
   def _DidLoadDocument(self, action_runner):
     action_runner.Wait(2)
     action_runner.ScrollPage()
     action_runner.Wait(2)
 
     action_runner.ScrollPage(direction='up')
 
     # Refine search query in the search box.
     # TODO(nednguyen): replace this with input text gesture to make it more
     # realistic.
-    action_runner.ExecuteJavaScript2(
+    action_runner.ExecuteJavaScript(
         js_template.Render(
             'document.querySelector({{ selector }}).value += "वितरण";',
             selector=self._SEARCH_BOX_SELECTOR))
     action_runner.Wait(2)
     action_runner.ClickElement(selector=self._SEARCH_BUTTON_SELECTOR)
 
     # Scroll down & click next search result page.
     action_runner.Wait(2)
     action_runner.ScrollPageToElement(selector=self._SEARCH_PAGE_2_SELECTOR)
     action_runner.Wait(2)
@@ skipping 141 matching lines @@
       inner_save_function = 'document.querySelector(".nameAndIcons")'
       action_runner.WaitForElement(element_function=inner_save_function)
       action_runner.ClickElement(element_function=inner_save_function)
       action_runner.Wait(1)  # Wait to make navigation realistic.
 
     # Close selection.
     x_element_function = ('document.querySelector('
                           '".Button.borderless.close.visible")')
     action_runner.ClickElement(element_function=x_element_function)
     action_runner.Wait(1)  # Wait to make navigation realistic.