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

telemetry/telemetry/internal/backends/chrome/cros_test_case.py

Index: telemetry/telemetry/internal/backends/chrome/cros_test_case.py
diff --git a/telemetry/telemetry/internal/backends/chrome/cros_test_case.py b/telemetry/telemetry/internal/backends/chrome/cros_test_case.py
index 0207a0ea6b9fd01e80f4c8aeb39b52737452fd75..9100d7a350bea29f4700c459d2879a91b3c0eeb1 100644
--- a/telemetry/telemetry/internal/backends/chrome/cros_test_case.py
+++ b/telemetry/telemetry/internal/backends/chrome/cros_test_case.py
@@ -10,6 +10,8 @@
 from telemetry.internal.browser import browser_finder
 from telemetry.internal.browser import extension_to_load
 from telemetry.testing import options_for_unittests
+
+import py_utils
 
 
 class CrOSTestCase(unittest.TestCase):
@@ -69,13 +71,13 @@
 
   def _GetLoginStatus(self, browser):
     extension = self._GetAutotestExtension(browser)
-    self.assertTrue(extension.EvaluateJavaScript2(
+    self.assertTrue(extension.EvaluateJavaScript(
         "typeof('chrome.autotestPrivate') != 'undefined'"))
-    extension.ExecuteJavaScript2('''
+    extension.ExecuteJavaScript('''
         window.__login_status = null;
         chrome.autotestPrivate.loginStatus(function(s) {
           window.__login_status = s;
         });
     ''')
-    return extension.WaitForJavaScriptCondition2(
-        'window.__login_status', timeout=10)
+    return py_utils.WaitFor(
+        lambda: extension.EvaluateJavaScript('window.__login_status'), 10)