Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Unified Diff: chrome/browser/chromeos/login/webview_login_browsertest.cc

Issue 1079083002: [cros New-GAIA] Webview login and new GAIA endpoint enabled by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/webview_login_browsertest.cc
diff --git a/chrome/browser/chromeos/login/webview_login_browsertest.cc b/chrome/browser/chromeos/login/webview_login_browsertest.cc
index c3163b205fe231a0c0b56adeb2f1b467f3c59b86..64be457b896a461413b44f9f11ee0a30a8497674 100644
--- a/chrome/browser/chromeos/login/webview_login_browsertest.cc
+++ b/chrome/browser/chromeos/login/webview_login_browsertest.cc
@@ -34,29 +34,12 @@ class WebviewLoginTest : public OobeBaseTest {
OobeBaseTest::SetUpCommandLine(command_line);
}
- void WaitForGaiaPageLoaded() {
- WaitForSigninScreen();
-
- ASSERT_TRUE(content::ExecuteScript(
- GetLoginUI()->GetWebContents(),
- "$('gaia-signin').gaiaAuthHost_.addEventListener('ready',"
- "function() {"
- "window.domAutomationController.setAutomationId(0);"
- "window.domAutomationController.send('GaiaReady');"
- "});"));
-
- content::DOMMessageQueue message_queue;
- std::string message;
- ASSERT_TRUE(message_queue.WaitForMessage(&message));
- EXPECT_EQ("\"GaiaReady\"", message);
- }
-
private:
DISALLOW_COPY_AND_ASSIGN(WebviewLoginTest);
};
IN_PROC_BROWSER_TEST_F(WebviewLoginTest, Basic) {
- WaitForGaiaPageLoaded();
+ WaitForGaiaPageLoad();
JsExpect("$('close-button-item').hidden");
@@ -76,7 +59,7 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, Basic) {
}
IN_PROC_BROWSER_TEST_F(WebviewLoginTest, BackButton) {
- WaitForGaiaPageLoaded();
+ WaitForGaiaPageLoad();
// Start: no back button, first page.
JsExpect("$('back-button-item').hidden");

Powered by Google App Engine
This is Rietveld 408576698