| 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");
|
|
|