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

tools/perf/benchmarks/media.py

 # Copyright 2014 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.
 
 from core import perf_benchmark
 
 from telemetry import benchmark
 from telemetry.page import legacy_page_test
 from telemetry.value import list_of_scalar_values
 from telemetry.value import scalar
 
 from measurements import media
 import page_sets
 
 
 class _MSEMeasurement(legacy_page_test.LegacyPageTest):
 
   def __init__(self):
     super(_MSEMeasurement, self).__init__()
 
   def ValidateAndMeasurePage(self, page, tab, results):
     del page  # unused
-    media_metric = tab.EvaluateJavaScript2('window.__testMetrics')
+    media_metric = tab.EvaluateJavaScript('window.__testMetrics')
     trace = media_metric['id'] if 'id' in media_metric else None
     metrics = media_metric['metrics'] if 'metrics' in media_metric else []
     for m in metrics:
       trace_name = '%s.%s' % (m, trace)
       if isinstance(metrics[m], list):
         results.AddValue(list_of_scalar_values.ListOfScalarValues(
             results.current_page, trace_name, units='ms',
             values=[float(v) for v in metrics[m]],
             important=True))
 
@@ skipping 104 matching lines @@
 
   @classmethod
   def Name(cls):
     return 'media.mse_cases'
 
   def SetExtraBrowserOptions(self, options):
     # Needed to allow XHR requests to return stream objects.
     options.AppendExtraBrowserArgs(
         ['--enable-experimental-web-platform-features',
          '--disable-gesture-requirement-for-media-playback'])