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

tools/perf/page_sets/tough_canvas_cases.py

 # Copyright 2014 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 import story
 
 
 class ToughCanvasCasesPage(page_module.Page):
 
   def __init__(self, url, page_set):
     super(ToughCanvasCasesPage, self).__init__(url=url, page_set=page_set)
     self.archive_data_file = 'data/tough_canvas_cases.json'
 
   def RunNavigateSteps(self, action_runner):
     super(ToughCanvasCasesPage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         "document.readyState == 'complete'")
 
   def RunPageInteractions(self, action_runner):
     with action_runner.CreateInteraction('CanvasAnimation'):
       action_runner.Wait(5)
 
 
 class MicrosofFirefliesPage(ToughCanvasCasesPage):
 
   def __init__(self, page_set):
@@ skipping 55 matching lines @@
       'file://tough_canvas_cases/rendering_throughput/fill_shapes.html',
       'file://tough_canvas_cases/rendering_throughput/stroke_shapes.html',
       'file://tough_canvas_cases/rendering_throughput/bouncing_clipped_rectangles.html',
       'file://tough_canvas_cases/rendering_throughput/bouncing_gradient_circles.html',
       'file://tough_canvas_cases/rendering_throughput/bouncing_svg_images.html',
       'file://tough_canvas_cases/rendering_throughput/bouncing_png_images.html'
     ]
 
     for url in urls_list:
       self.AddStory(ToughCanvasCasesPage(url, self))