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

telemetry/telemetry/internal/browser/tab_unittest.py

Index: telemetry/telemetry/internal/browser/tab_unittest.py
diff --git a/telemetry/telemetry/internal/browser/tab_unittest.py b/telemetry/telemetry/internal/browser/tab_unittest.py
index e3c6b5e725cff971e94d7f25a2a79c965bbd4388..2692998b4e179eb60b21939a3f77f67ded382088 100644
--- a/telemetry/telemetry/internal/browser/tab_unittest.py
+++ b/telemetry/telemetry/internal/browser/tab_unittest.py
@@ -19,7 +19,7 @@
 
 
 def _IsDocumentVisible(tab):
-  return not tab.EvaluateJavaScript2('document.hidden || document.webkitHidden')
+  return not tab.EvaluateJavaScript('document.hidden || document.webkitHidden')
 
 
 class FakePlatformBackend(object):
@@ -68,7 +68,7 @@
                                                  timeout=30))
 
   def testTimeoutExceptionIncludeConsoleMessage(self):
-    self._tab.EvaluateJavaScript2("""
+    self._tab.EvaluateJavaScript("""
         window.__set_timeout_called = false;
         function buggyReference() {
           window.__set_timeout_called = true;
@@ -76,11 +76,11 @@
              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'),
@@ -156,10 +156,10 @@
     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)
 
@@ -211,7 +211,7 @@
       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