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

tools/perf/page_sets/infinite_scroll_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
 
 TIME_TO_WAIT_BEFORE_STARTING_IN_SECONDS = 5
 SCROLL_TIMEOUT_IN_SECONDS = 120
 
@@ skipping 29 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(self, 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 InfiniteScrollPageSet(story.StorySet):
@@ skipping 10 matching lines @@
         ('https://www.facebook.com/shakira', 'facebook', SCROLL_FAR, 0, 0),
         ('https://twitter.com/taylorswift13', 'twitter', SCROLL_PAGE, 10, 30),
         ('http://techcrunch.tumblr.com/', 'tumblr', SCROLL_FAR, 0, 0),
         ('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)
     ]
     for (url, name, scroll_amount, delay, repeat) in pages:
       self.AddStory(
         InfiniteScrollPage(url, self, name, scroll_amount, delay, repeat))