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

tools/perf/benchmarks/spaceport.py

 # Copyright 2012 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.
 
 """Runs spaceport.io's PerfMarks benchmark."""
 
 import json
 import logging
 import os
 
@@ skipping 42 matching lines @@
 class _SpaceportMeasurement(legacy_page_test.LegacyPageTest):
 
   def __init__(self):
     super(_SpaceportMeasurement, self).__init__()
 
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs('--disable-gpu-vsync')
 
   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;
             var key_val = str.split(': ');
             if (!key_val.length == 2) return;
             __results[key_val[0]] = key_val[1];
         };
         document.getElementById('start-performance-tests').click();
         """)
 
     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)
       results.AddValue(scalar.ScalarValue(
           results.current_page, '%s.%s' % (chart, trace),
           'objects (bigger is better)', float(result_dict[key]),
           important=False, description=DESCRIPTIONS.get(chart)))
     results.AddValue(list_of_scalar_values.ListOfScalarValues(
         results.current_page, 'Score', 'objects (bigger is better)',
         [float(x) for x in result_dict.values()],
@@ skipping 17 matching lines @@
   @classmethod
   def Name(cls):
     return 'spaceport'
 
   def CreateStorySet(self, options):
     spaceport_dir = os.path.join(path_util.GetChromiumSrcDir(), 'chrome',
                                  'test', 'data', 'third_party', 'spaceport')
     ps = story.StorySet(base_dir=spaceport_dir)
     ps.AddStory(page_module.Page('file://index.html', ps, ps.base_dir))
     return ps