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

tools/perf/page_sets/top_pages.py

Index: tools/perf/page_sets/top_pages.py
diff --git a/tools/perf/page_sets/top_pages.py b/tools/perf/page_sets/top_pages.py
index bb758447a80d7fd7e2f0159b93df80a314e0dfa6..7f0d187b3d427b74e1b6d6e1a8b5456302c69484 100644
--- a/tools/perf/page_sets/top_pages.py
+++ b/tools/perf/page_sets/top_pages.py
@@ -59,7 +59,7 @@ class GmailPage(TopPages):
 
   def RunNavigateSteps(self, action_runner):
     super(GmailPage, self).RunNavigateSteps(action_runner)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'window.gmonkey !== undefined &&'
         'document.getElementById("gb") !== null')
 
@@ -80,7 +80,7 @@ class GoogleCalendarPage(TopPages):
     super(GoogleCalendarPage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(2)
     action_runner.WaitForElement('div[class~="navForward"]')
-    action_runner.ExecuteJavaScript2('''
+    action_runner.ExecuteJavaScript('''
         (function() {
           var elem = document.createElement('meta');
           elem.name='viewport';
@@ -107,7 +107,7 @@ class GoogleDocPage(TopPages):
   def RunNavigateSteps(self, action_runner):
     super(GoogleDocPage, self).RunNavigateSteps(action_runner)
     action_runner.Wait(2)
-    action_runner.WaitForJavaScriptCondition2(
+    action_runner.WaitForJavaScriptCondition(
         'document.getElementsByClassName("kix-appview-editor").length')