Revert of [Telemetry] Switch clients to new JavaScript API (batch 5)

telemetry/telemetry/internal/browser/tab_unittest.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.
 
 import logging
 import tempfile
 import time
 
 from telemetry.core import exceptions
 from telemetry import decorators
 from telemetry.internal.image_processing import video
 from telemetry.testing import tab_test_case
 from telemetry.timeline import model
 from telemetry.timeline import tracing_config
 from telemetry.util import image_util
 from telemetry.util import rgba_color
 
 import py_utils
 
 
 def _IsDocumentVisible(tab):
-  return not tab.EvaluateJavaScript2('document.hidden || document.webkitHidden')
+  return not tab.EvaluateJavaScript('document.hidden || document.webkitHidden')
 
 
 class FakePlatformBackend(object):
   def __init__(self):
     self.platform = FakePlatform()
 
   def DidStartBrowser(self, _, _2):
     pass
 
   def WillCloseBrowser(self, _, _2):
@@ skipping 28 matching lines @@
 
   def testTabBrowserIsRightBrowser(self):
     self.assertEquals(self._tab.browser, self._browser)
 
   def testRendererCrash(self):
     self.assertRaises(exceptions.DevtoolsTargetCrashException,
                       lambda: self._tab.Navigate('chrome://crash',
                                                  timeout=30))
 
   def testTimeoutExceptionIncludeConsoleMessage(self):
-    self._tab.EvaluateJavaScript2("""
+    self._tab.EvaluateJavaScript("""
         window.__set_timeout_called = false;
         function buggyReference() {
           window.__set_timeout_called = true;
           if (window.__one.not_defined === undefined)
              window.__one = 1;
         }
         setTimeout(buggyReference, 200);""")
-    self._tab.WaitForJavaScriptCondition2(
-        'window.__set_timeout_called === true', timeout=5)
+    self._tab.WaitForJavaScriptExpression(
+        'window.__set_timeout_called === true', 5)
     with self.assertRaises(py_utils.TimeoutException) as context:
-      self._tab.WaitForJavaScriptCondition2(
-          'window.__one === 1', timeout=1)
+      self._tab.WaitForJavaScriptExpression(
+          'window.__one === 1', 1)
       self.assertIn(
         ("(error) :5: Uncaught TypeError: Cannot read property 'not_defined' "
         'of undefined\n'),
         context.exception.message)
 
   @decorators.Enabled('has tabs')
   def testActivateTab(self):
     py_utils.WaitFor(lambda: _IsDocumentVisible(self._tab), timeout=5)
     new_tab = self._browser.tabs.New()
     new_tab.Navigate('about:blank')
@@ skipping 55 matching lines @@
     second_tab.Navigate('about:blank')
     second_tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
     third_tab = self._browser.tabs.New()
     third_tab.Navigate('about:blank')
     third_tab.WaitForDocumentReadyStateToBeInteractiveOrBetter()
     third_tab.Close()
     config = tracing_config.TracingConfig()
     config.chrome_trace_config.SetLowOverheadFilter()
     config.enable_chrome_trace = True
     self._browser.platform.tracing_controller.StartTracing(config)
-    first_tab.ExecuteJavaScript2('console.time("first-tab-marker");')
-    first_tab.ExecuteJavaScript2('console.timeEnd("first-tab-marker");')
-    second_tab.ExecuteJavaScript2('console.time("second-tab-marker");')
-    second_tab.ExecuteJavaScript2('console.timeEnd("second-tab-marker");')
+    first_tab.ExecuteJavaScript('console.time("first-tab-marker");')
+    first_tab.ExecuteJavaScript('console.timeEnd("first-tab-marker");')
+    second_tab.ExecuteJavaScript('console.time("second-tab-marker");')
+    second_tab.ExecuteJavaScript('console.timeEnd("second-tab-marker");')
     trace_data = self._browser.platform.tracing_controller.StopTracing()
     timeline_model = model.TimelineModel(trace_data)
 
     # Assert that the renderer_thread of the first tab contains
     # 'first-tab-marker'.
     renderer_thread = timeline_model.GetRendererThreadFromTabId(
         first_tab.id)
     first_tab_markers = [
         renderer_thread.IterAllSlicesOfName('first-tab-marker')]
     self.assertEquals(1, len(first_tab_markers))
@@ skipping 31 matching lines @@
 
   # Test flaky on mac: crbug.com/358664, chromeos: crbug.com/483212.
   @decorators.Disabled('android', 'mac', 'chromeos')
   @decorators.Disabled('win')  # catapult/issues/2282
   def testScreenshot(self):
     if not self._tab.screenshot_supported:
       logging.warning('Browser does not support screenshots, skipping test.')
       return
 
     self.Navigate('green_rect.html')
-    pixel_ratio = self._tab.EvaluateJavaScript2('window.devicePixelRatio || 1')
+    pixel_ratio = self._tab.EvaluateJavaScript('window.devicePixelRatio || 1')
 
     screenshot = self._tab.Screenshot(5)
     assert screenshot is not None
     image_util.GetPixelColor(
         screenshot, 0 * pixel_ratio, 0 * pixel_ratio).AssertIsRGB(
             0, 255, 0, tolerance=2)
     image_util.GetPixelColor(
         screenshot, 31 * pixel_ratio, 31 * pixel_ratio).AssertIsRGB(
             0, 255, 0, tolerance=2)
     image_util.GetPixelColor(
@@ skipping 14 matching lines @@
     self._tab.Navigate(self.UrlOfUnittestFile('cast.html'))
     self._tab.WaitForDocumentReadyStateToBeComplete()
     self._tab.action_runner.TapElement(selector='#start_session_button')
     # Wait for media router dialog
     start_time = time.time()
     while (time.time() - start_time < 5 and
            len(self.tabs) != 2):
       time.sleep(1)
     self.assertEquals(len(self.tabs), 2)
     self.assertEquals(self.tabs[1].url, 'chrome://media-router/')