Revert "Speculative revert by sheriff"

chrome/browser/chromeos/login/webview_login_browsertest.cc

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..b7d3caa4a681606f2accfe80050ba77feddba623 100644
--- a/chrome/browser/chromeos/login/webview_login_browsertest.cc
+++ b/chrome/browser/chromeos/login/webview_login_browsertest.cc
@@ -10,57 +10,27 @@
 #include "content/public/test/test_utils.h"
 
 namespace chromeos {
-namespace {
-const char kFakeUserEmail[] = "fake-email@gmail.com";
-const char kFakeUserPassword[] = "fake-password";
-const char kFakeSIDCookie[] = "fake-SID-cookie";
-const char kFakeLSIDCookie[] = "fake-LSID-cookie";
-}
 
 class WebviewLoginTest : public OobeBaseTest {
  public:
-  WebviewLoginTest() { use_webview_ = true; }
+  WebviewLoginTest() { set_use_webview(true); }
   ~WebviewLoginTest() override {}
 
-  void SetUpOnMainThread() override {
-    fake_gaia_->SetFakeMergeSessionParams(kFakeUserEmail, kFakeSIDCookie,
-                                          kFakeLSIDCookie);
-
-    OobeBaseTest::SetUpOnMainThread();
-  }
-
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kOobeSkipPostLogin);
     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");
 
-  SetSignFormField("identifier", kFakeUserEmail);
+  SetSignFormField("identifier", OobeBaseTest::kFakeUserEmail);
   ExecuteJsInSigninFrame("document.getElementById('nextButton').click();");
 
   JsExpect("$('close-button-item').hidden");
@@ -69,21 +39,21 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, Basic) {
       chrome::NOTIFICATION_SESSION_STARTED,
       content::NotificationService::AllSources());
 
-  SetSignFormField("password", kFakeUserPassword);
+  SetSignFormField("password", OobeBaseTest::kFakeUserPassword);
   ExecuteJsInSigninFrame("document.getElementById('nextButton').click();");
 
   session_start_waiter.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(WebviewLoginTest, BackButton) {
-  WaitForGaiaPageLoaded();
+  WaitForGaiaPageLoad();
 
   // Start: no back button, first page.
   JsExpect("$('back-button-item').hidden");
   JsExpect("$('signin-frame').src.indexOf('#identifier') != -1");
 
   // Next step: back button active, second page.
-  SetSignFormField("identifier", kFakeUserEmail);
+  SetSignFormField("identifier", OobeBaseTest::kFakeUserEmail);
   ExecuteJsInSigninFrame("document.getElementById('nextButton').click();");
   JsExpect("!$('back-button-item').hidden");
   JsExpect("$('signin-frame').src.indexOf('#challengepassword') != -1");
@@ -103,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(WebviewLoginTest, BackButton) {
       chrome::NOTIFICATION_SESSION_STARTED,
       content::NotificationService::AllSources());
 
-  SetSignFormField("password", kFakeUserPassword);
+  SetSignFormField("password", OobeBaseTest::kFakeUserPassword);
   ExecuteJsInSigninFrame("document.getElementById('nextButton').click();");
 
   session_start_waiter.Wait();