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

tools/perf/page_sets/mobile_infinite_scroll_cases.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 import mobile_facebook_page
 from telemetry.page import page as page_module
 from telemetry.page import shared_page_state
 from telemetry import story
 
 TIME_TO_WAIT_BEFORE_STARTING_IN_SECONDS = 5
 SCROLL_TIMEOUT_IN_SECONDS = 120
@@ skipping 11 matching lines @@
     action_runner.RepeatableBrowserDrivenScroll(
       y_scroll_distance_ratio=scroll_amount,
       repeat_delay_ms=delay,
       repeat_count=repeat,
       timeout=SCROLL_TIMEOUT_IN_SECONDS)
   with action_runner.CreateInteraction('End'):
     action_runner.tab.browser.DumpMemory()
 
 def _WaitAction(action_runner):
   with action_runner.CreateInteraction('Load'):
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
       'document.body != null && '
       'document.body.scrollHeight > window.innerHeight && '
       '!document.body.addEventListener("touchstart", function() {})')
   with action_runner.CreateInteraction('Wait'):
     action_runner.Wait(TIME_TO_WAIT_BEFORE_STARTING_IN_SECONDS)
   with action_runner.CreateInteraction('GC'):
     action_runner.ForceGarbageCollection()
 
 class MobileInfiniteScrollPage(page_module.Page):
   def __init__(self, url, page_set, name, scroll_amount, delay, repeat,
@@ skipping 46 matching lines @@
         ('https://www.flickr.com/explore', 'flickr', SCROLL_FAR, 0, 0),
         ('https://meta.discourse.org/t/the-official-discourse-tags-plugin-discourse-tagging/26482',
          'discourse', SCROLL_PAGE, 10, 30)
     ]
     self.AddStory(
       MobileInfiniteScrollFacebookPage(pages[0][0], self, pages[0][1],
                                        pages[0][2], pages[0][3], pages[0][4]))
     for (url, name, scroll_amount, delay, repeat) in pages[1:]:
       self.AddStory(
         MobileInfiniteScrollPage(url, self, name, scroll_amount, delay, repeat))