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

tools/perf/benchmarks/spaceport.py

Index: tools/perf/benchmarks/spaceport.py
diff --git a/tools/perf/benchmarks/spaceport.py b/tools/perf/benchmarks/spaceport.py
index 5d13cb915175f37bfad74e3d5c0e73677a20f525..46f3b398e4209df1167dc1fc5769f9f22711baea 100644
--- a/tools/perf/benchmarks/spaceport.py
+++ b/tools/perf/benchmarks/spaceport.py
@@ -60,11 +60,11 @@ class _SpaceportMeasurement(legacy_page_test.LegacyPageTest):
 
   def ValidateAndMeasurePage(self, page, tab, results):
     del page  # unused
-    tab.WaitForJavaScriptCondition2(
+    tab.WaitForJavaScriptCondition(
         '!document.getElementById("start-performance-tests").disabled',
         timeout=60)
 
-    tab.ExecuteJavaScript2("""
+    tab.ExecuteJavaScript("""
         window.__results = {};
         window.console.log = function(str) {
             if (!str) return;
@@ -78,16 +78,16 @@ class _SpaceportMeasurement(legacy_page_test.LegacyPageTest):
     num_results = 0
     num_tests_in_spaceport = 24
     while num_results < num_tests_in_spaceport:
-      tab.WaitForJavaScriptCondition2(
+      tab.WaitForJavaScriptCondition(
           'Object.keys(window.__results).length > {{ num_results }}',
           num_results=num_results,
           timeout=180)
-      num_results = tab.EvaluateJavaScript2(
+      num_results = tab.EvaluateJavaScript(
           'Object.keys(window.__results).length')
       logging.info('Completed test %d of %d',
                    num_results, num_tests_in_spaceport)
 
-    result_dict = json.loads(tab.EvaluateJavaScript2(
+    result_dict = json.loads(tab.EvaluateJavaScript(
         'JSON.stringify(window.__results)'))
     for key in result_dict:
       chart, trace = key.split('.', 1)