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

telemetry/telemetry/internal/backends/chrome/cros_unittest.py

Index: telemetry/telemetry/internal/backends/chrome/cros_unittest.py
diff --git a/telemetry/telemetry/internal/backends/chrome/cros_unittest.py b/telemetry/telemetry/internal/backends/chrome/cros_unittest.py
index 826bcaaf30be677966088db63c5bc0fd40b4b80b..6fadd25716bb8f5c8d65bacbee6058e58b0ba28c 100644
--- a/telemetry/telemetry/internal/backends/chrome/cros_unittest.py
+++ b/telemetry/telemetry/internal/backends/chrome/cros_unittest.py
@@ -101,7 +101,7 @@
     with self._CreateBrowser(autotest_ext=True) as b:
       extension = self._GetAutotestExtension(b)
       try:
-        extension.ExecuteJavaScript('chrome.autotestPrivate.logout();')
+        extension.ExecuteJavaScript2('chrome.autotestPrivate.logout();')
       except exceptions.Error:
         pass
       py_utils.WaitFor(lambda: not self._IsCryptohomeMounted(), 20)
@@ -153,40 +153,38 @@
     self.assertFalse(self._IsScreenLocked(browser))
 
     extension = self._GetAutotestExtension(browser)
-    self.assertTrue(extension.EvaluateJavaScript(
+    self.assertTrue(extension.EvaluateJavaScript2(
         "typeof chrome.autotestPrivate.lockScreen == 'function'"))
     logging.info('Locking screen')
-    extension.ExecuteJavaScript('chrome.autotestPrivate.lockScreen();')
+    extension.ExecuteJavaScript2('chrome.autotestPrivate.lockScreen();')
 
     logging.info('Waiting for the lock screen')
     def ScreenLocked():
       return (browser.oobe_exists and
-          browser.oobe.EvaluateJavaScript("typeof Oobe == 'function'") and
-          browser.oobe.EvaluateJavaScript(
-          "typeof Oobe.authenticateForTesting == 'function'"))
+          browser.oobe.EvaluateJavaScript2("typeof Oobe == 'function'") and
+          browser.oobe.EvaluateJavaScript2(
+              "typeof Oobe.authenticateForTesting == 'function'"))
     py_utils.WaitFor(ScreenLocked, 10)
     self.assertTrue(self._IsScreenLocked(browser))
 
   def _AttemptUnlockBadPassword(self, browser):
     logging.info('Trying a bad password')
     def ErrorBubbleVisible():
-      return not browser.oobe.EvaluateJavaScript('''
-          document.getElementById('bubble').hidden
-      ''')
+      return not browser.oobe.EvaluateJavaScript2(
+          "document.getElementById('bubble').hidden")
+
     self.assertFalse(ErrorBubbleVisible())
-    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
-    browser.oobe.ExecuteJavaScript('''
-        Oobe.authenticateForTesting('%s', 'bad');
-    ''' % self._username)
+    browser.oobe.ExecuteJavaScript2(
+        "Oobe.authenticateForTesting({{ username }}, 'bad');",
+        username=self._username)
     py_utils.WaitFor(ErrorBubbleVisible, 10)
     self.assertTrue(self._IsScreenLocked(browser))
 
   def _UnlockScreen(self, browser):
     logging.info('Unlocking')
-    # TODO(catapult:#3028): Fix interpolation of JavaScript values.
-    browser.oobe.ExecuteJavaScript('''
-        Oobe.authenticateForTesting('%s', '%s');
-    ''' % (self._username, self._password))
+    browser.oobe.ExecuteJavaScript2(
+        'Oobe.authenticateForTesting({{ username }}, {{ password }});',
+        username=self._username, password=self._password)
     py_utils.WaitFor(lambda: not browser.oobe_exists, 10)
     self.assertFalse(self._IsScreenLocked(browser))