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

tools/perf/measurements/rasterize_and_record_micro.py

 # Copyright 2013 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 time
 
 from telemetry.page import legacy_page_test
 from telemetry.value import scalar
 
 import py_utils
@@ skipping 17 matching lines @@
 
   def ValidateAndMeasurePage(self, page, tab, results):
     del page  # unused
     try:
       tab.WaitForDocumentReadyStateToBeComplete()
     except py_utils.TimeoutException:
       pass
     time.sleep(self._start_wait_time)
 
     # Enqueue benchmark
-    tab.ExecuteJavaScript2("""
+    tab.ExecuteJavaScript("""
         window.benchmark_results = {};
         window.benchmark_results.done = false;
         window.benchmark_results.id =
             chrome.gpuBenchmarking.runMicroBenchmark(
                 "rasterize_and_record_benchmark",
                 function(value) {
                   window.benchmark_results.done = true;
                   window.benchmark_results.results = value;
                 }, {
                   "record_repeat_count": {{ record_repeat_count }},
                   "rasterize_repeat_count": {{ rasterize_repeat_count }}
                 });
         """,
         record_repeat_count=self._record_repeat,
         rasterize_repeat_count=self._rasterize_repeat)
 
     # Evaluating this expression usually takes between 60 and 90 seconds.
-    benchmark_id = tab.EvaluateJavaScript2(
+    benchmark_id = tab.EvaluateJavaScript(
         'window.benchmark_results.id', timeout=self._timeout)
     if not benchmark_id:
       raise legacy_page_test.MeasurementFailure(
           'Failed to schedule rasterize_and_record_micro')
 
-    tab.WaitForJavaScriptCondition2(
+    tab.WaitForJavaScriptCondition(
         'window.benchmark_results.done', timeout=self._timeout)
 
-    data = tab.EvaluateJavaScript2('window.benchmark_results.results')
+    data = tab.EvaluateJavaScript('window.benchmark_results.results')
 
     pixels_recorded = data['pixels_recorded']
     record_time = data['record_time_ms']
     pixels_rasterized = data['pixels_rasterized']
     rasterize_time = data['rasterize_time_ms']
     picture_memory_usage = data['picture_memory_usage']
 
     results.AddValue(scalar.ScalarValue(
         results.current_page, 'pixels_recorded', 'pixels', pixels_recorded))
     results.AddValue(scalar.ScalarValue(
@@ skipping 63 matching lines @@
           results.current_page, 'total_layers', 'count', total_layers))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers', 'count',
           total_picture_layers))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers_with_no_content', 'count',
           total_picture_layers_with_no_content))
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'total_picture_layers_off_screen', 'count',
           total_picture_layers_off_screen))