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

content/test/gpu/gpu_tests/webgl_conformance_integration_test.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.
 
 import logging
 import os
 import sys
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import path_util
@@ skipping 189 matching lines @@
     # This indirection allows these tests to trampoline through
     # _RunGpuTest.
     test_name = args[0]
     getattr(self, test_name)(test_path, *args[1:])
 
   def _NavigateTo(self, test_path, harness_script):
     url = self.UrlOfStaticFilePath(test_path)
     self.tab.Navigate(url, script_to_evaluate_on_commit=harness_script)
 
   def _CheckTestCompletion(self):
-    self.tab.action_runner.WaitForJavaScriptCondition2(
+    self.tab.action_runner.WaitForJavaScriptCondition(
         'webglTestHarness._finished', timeout=300)
     if not self._DidWebGLTestSucceed(self.tab):
       self.fail(self._WebGLTestMessages(self.tab))
 
   def _RunConformanceTest(self, test_path, *args):
     self._NavigateTo(test_path, conformance_harness_script)
     self._CheckTestCompletion()
 
 
   def _GetExtensionHarnessScript(self):
     return conformance_harness_script + extension_harness_additional_script
 
   def _RunExtensionCoverageTest(self, test_path, *args):
     self._NavigateTo(test_path, self._GetExtensionHarnessScript())
-    self.tab.action_runner.WaitForJavaScriptCondition2(
+    self.tab.action_runner.WaitForJavaScriptCondition(
         'window._loaded', timeout=300)
     extension_list = args[0]
     webgl_version = args[1]
     context_type = "webgl2" if webgl_version == 2 else "webgl"
     extension_list_string = "["
     for extension in extension_list:
       extension_list_string = extension_list_string + extension + ", "
     extension_list_string = extension_list_string + "]"
-    self.tab.action_runner.EvaluateJavaScript2(
+    self.tab.action_runner.EvaluateJavaScript(
         'checkSupportedExtensions({{ extensions_string }}, {{context_type}})',
         extensions_string=extension_list_string, context_type=context_type)
     self._CheckTestCompletion()
 
   def _RunExtensionTest(self, test_path, *args):
     self._NavigateTo(test_path, self._GetExtensionHarnessScript())
-    self.tab.action_runner.WaitForJavaScriptCondition2(
+    self.tab.action_runner.WaitForJavaScriptCondition(
         'window._loaded', timeout=300)
     extension = args[0]
     webgl_version = args[1]
     context_type = "webgl2" if webgl_version == 2 else "webgl"
-    self.tab.action_runner.EvaluateJavaScript2(
+    self.tab.action_runner.EvaluateJavaScript(
       'checkExtension({{ extension }}, {{ context_type }})',
       extension=extension, context_type=context_type)
     self._CheckTestCompletion()
 
   @classmethod
   def CustomizeOptions(cls):
     assert cls._webgl_version == 1 or cls._webgl_version == 2
     browser_options = cls._finder_options.browser_options
     # --test-type=gpu is used only to suppress the "Google API Keys are missing"
     # infobar, which causes flakiness in tests.
@@ skipping 65 matching lines @@
     # implicitly becomes the common base directory, i.e., the Chromium
     # src dir, and all URLs have to be specified relative to that.
     cls.SetStaticServerDirs([
       os.path.join(path_util.GetChromiumSrcDir(), conformance_relpath),
       os.path.join(path_util.GetChromiumSrcDir(), extensions_relpath)])
 
   # Helper functions.
 
   @staticmethod
   def _DidWebGLTestSucceed(tab):
-    return tab.EvaluateJavaScript2('webglTestHarness._allTestSucceeded')
+    return tab.EvaluateJavaScript('webglTestHarness._allTestSucceeded')
 
   @staticmethod
   def _WebGLTestMessages(tab):
-    return tab.EvaluateJavaScript2('webglTestHarness._messages')
+    return tab.EvaluateJavaScript('webglTestHarness._messages')
 
   @classmethod
   def _ParseTests(cls, path, version, webgl2_only, folder_min_version):
     test_paths = []
     current_dir = os.path.dirname(path)
     full_path = os.path.normpath(os.path.join(conformance_path, path))
     webgl_version = int(version.split('.')[0])
 
     if not os.path.exists(full_path):
       raise Exception('The WebGL conformance test path specified ' +
@@ skipping 49 matching lines @@
           if webgl_version > 1:
             test += '?webglVersion=' + str(webgl_version)
           test_paths.append(test)
 
     return test_paths
 
 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])