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

content/test/gpu/gpu_tests/trace_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 os
 import sys
 
 from gpu_tests import gpu_integration_test
 from gpu_tests import path_util
 from gpu_tests import pixel_test_pages
@@ skipping 75 matching lines @@
     config.chrome_trace_config.category_filter.AddExcludedCategory('*')
     for cat in TOPLEVEL_CATEGORIES:
       config.chrome_trace_config.category_filter.AddDisabledByDefault(cat)
     config.enable_chrome_trace = True
     tab = self.tab
     tab.browser.platform.tracing_controller.StartTracing(config, 60)
 
     # Perform page navigation.
     url = self.UrlOfStaticFilePath(test_path)
     tab.Navigate(url, script_to_evaluate_on_commit=test_harness_script)
-    tab.action_runner.WaitForJavaScriptCondition2(
+    tab.action_runner.WaitForJavaScriptCondition(
       'domAutomationController._finished', timeout=30)
 
     # Stop tracing.
     timeline_data = tab.browser.platform.tracing_controller.StopTracing()
 
     # Evaluate success.
     timeline_model = model_module.TimelineModel(timeline_data)
     category_name = args[0]
     event_iter = timeline_model.IterAllEvents(
         event_type_predicate=model_module.IsSliceOrAsyncSlice)
@@ skipping 17 matching lines @@
     super(cls, TraceIntegrationTest).SetUpProcess()
     path_util.SetupTelemetryPaths()
     cls.CustomizeOptions()
     cls.SetBrowserOptions(cls._finder_options)
     cls.StartBrowser()
     cls.SetStaticServerDirs([data_path])
 
 def load_tests(loader, tests, pattern):
   del loader, tests, pattern  # Unused.
   return gpu_integration_test.LoadAllTestsInModule(sys.modules[__name__])