wake lock: Use content::EvalJs() in browser tests

Replace uses of content::ExecuteScriptAndExtractString() and variations with
content::EvalJs(). The code looks smaller, simpler and easier to understand.

Change-Id: I1ebac4f1084176d490487d548eec931021df5f14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1855979
Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Commit-Queue: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#705146}

chrome/browser/wake_lock/wake_lock_browsertest.cc

@@ -154,13 +154,9 @@ IN_PROC_BROWSER_TEST_F(WakeLockBrowserTest, RequestPermissionScreen) {
 
   PermissionRequestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents());
-  std::string response;
-  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
-      browser()->tab_strip_model()->GetActiveWebContents(),
-      "WakeLock.requestPermission('screen').then(status => "
-      "    domAutomationController.send(status));",
-      &response));
-  EXPECT_EQ(response, "granted");
+  EXPECT_EQ("granted", content::EvalJs(
+                           browser()->tab_strip_model()->GetActiveWebContents(),
+                           "WakeLock.requestPermission('screen')"));
   EXPECT_EQ(observer.request_shown(), false);
 }
 
@@ -172,13 +168,11 @@ IN_PROC_BROWSER_TEST_F(WakeLockBrowserTest,
 
   PermissionRequestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents());
-  std::string response;
-  EXPECT_TRUE(content::ExecuteScriptWithoutUserGestureAndExtractString(
-      browser()->tab_strip_model()->GetActiveWebContents(),
-      "WakeLock.requestPermission('screen').then(status => "
-      "    domAutomationController.send(status));",
-      &response));
-  EXPECT_EQ(response, "granted");
+  EXPECT_EQ(
+      "granted",
+      content::EvalJs(browser()->tab_strip_model()->GetActiveWebContents(),
+                      "WakeLock.requestPermission('screen')",
+                      content::EvalJsOptions::EXECUTE_SCRIPT_NO_USER_GESTURE));
   EXPECT_EQ(observer.request_shown(), false);
 }
 
@@ -189,13 +183,9 @@ IN_PROC_BROWSER_TEST_F(WakeLockBrowserTest, RequestPermissionSystem) {
 
   PermissionRequestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents());
-  std::string response;
-  EXPECT_TRUE(content::ExecuteScriptAndExtractString(
-      browser()->tab_strip_model()->GetActiveWebContents(),
-      "WakeLock.requestPermission('system').then(status => "
-      "    domAutomationController.send(status));",
-      &response));
-  EXPECT_EQ(response, "denied");
+  EXPECT_EQ("denied", content::EvalJs(
+                          browser()->tab_strip_model()->GetActiveWebContents(),
+                          "WakeLock.requestPermission('system')"));
   EXPECT_EQ(observer.request_shown(), false);
 }
 
@@ -207,12 +197,10 @@ IN_PROC_BROWSER_TEST_F(WakeLockBrowserTest,
 
   PermissionRequestObserver observer(
       browser()->tab_strip_model()->GetActiveWebContents());
-  std::string response;
-  EXPECT_TRUE(content::ExecuteScriptWithoutUserGestureAndExtractString(
-      browser()->tab_strip_model()->GetActiveWebContents(),
-      "WakeLock.requestPermission('system').then(status => "
-      "    domAutomationController.send(status));",
-      &response));
-  EXPECT_EQ(response, "denied");
+  EXPECT_EQ(
+      "denied",
+      content::EvalJs(browser()->tab_strip_model()->GetActiveWebContents(),
+                      "WakeLock.requestPermission('system')",
+                      content::EvalJsOptions::EXECUTE_SCRIPT_NO_USER_GESTURE));
   EXPECT_EQ(observer.request_shown(), false);
 }