Add AuthPolicyLoginHelper

chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc

Index: chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc
diff --git a/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc b/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc
index 7b602e29762fd6cf9e4778bb9954ccf38a0729d4..35308a77ace6e628a84e202ed9c2fc9bd0feb063 100644
--- a/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc
+++ b/chrome/browser/chromeos/login/enterprise_enrollment_browsertest.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/chromeos/policy/enrollment_status_chromeos.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/upstart_client.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 
 using testing::_;
@@ -155,6 +156,34 @@ class EnterpriseEnrollmentTest : public LoginManagerTest {
     });
   }
 
+  void SetupActiveDirectoryJSNotifications() {
+    js_checker().Evaluate(
+        "var testShowStep = login.OAuthEnrollmentScreen.showStep;"
+        "login.OAuthEnrollmentScreen.showStep = function(step) {"
+        "  testShowStep(step);"
+        "  if (step == 'working') {"
+        "    window.domAutomationController.setAutomationId(0);"
+        "    window.domAutomationController.send('ShowSpinnerScreen');"
+        "  }"
+        "}");
+    js_checker().Evaluate(
+        "var testInvalidateAd = login.OAuthEnrollmentScreen.invalidateAd;"
+        "login.OAuthEnrollmentScreen.invalidateAd = function(machineName, "
+        "user, errorState) {"
+        "  testInvalidateAd(machineName, user, errorState);"
+        "  window.domAutomationController.setAutomationId(0);"
+        "  window.domAutomationController.send('ShowJoinDomainError');"
+        "}");
+  }
+
+  void WaitForMessage(content::DOMMessageQueue* message_queue,
+                      const std::string& expected_message) {
+    std::string message;
+    do {
+      ASSERT_TRUE(message_queue->WaitForMessage(&message));
+    } while (message != expected_message);
+  }
+
   // Fills out the UI with device attribute information and submits it.
   void SubmitAttributePromptUpdate() {
     // Fill out the attribute prompt info and submit it.
@@ -297,7 +326,10 @@ IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest,
       ->GetUpstartClient()
       ->StartAuthPolicyService();
 
+  content::DOMMessageQueue message_queue;
+  SetupActiveDirectoryJSNotifications();
   SubmitActiveDirectoryCredentials("machine_name", kAdTestUser, "password");
+  WaitForMessage(&message_queue, "\"ShowSpinnerScreen\"");
   EXPECT_FALSE(IsStepDisplayed("ad-join"));
 
   CompleteEnrollment();
@@ -323,9 +355,11 @@ IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest,
       ->GetUpstartClient()
       ->StartAuthPolicyService();
 
+  content::DOMMessageQueue message_queue;
   // Checking error in case of empty password. Whether password is not empty
   // being checked in the UI. Machine name length is checked after that in the
   // authpolicyd.
+  SetupActiveDirectoryJSNotifications();
   SubmitActiveDirectoryCredentials("too_long_machine_name", kAdTestUser, "");
   EXPECT_TRUE(IsStepDisplayed("ad-join"));
   js_checker().ExpectFalse(std::string(kAdMachineNameInput) + ".isInvalid");
@@ -335,6 +369,7 @@ IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest,
   // Checking error in case of too long machine name.
   SubmitActiveDirectoryCredentials("too_long_machine_name", kAdTestUser,
                                    "password");
+  WaitForMessage(&message_queue, "\"ShowJoinDomainError\"");
   EXPECT_TRUE(IsStepDisplayed("ad-join"));
   js_checker().ExpectTrue(std::string(kAdMachineNameInput) + ".isInvalid");
   js_checker().ExpectFalse(std::string(kAdUsernameInput) + ".isInvalid");
@@ -342,6 +377,7 @@ IN_PROC_BROWSER_TEST_F(EnterpriseEnrollmentTest,
 
   // Checking error in case of bad username (without realm).
   SubmitActiveDirectoryCredentials("machine_name", "test_user", "password");
+  WaitForMessage(&message_queue, "\"ShowJoinDomainError\"");
   EXPECT_TRUE(IsStepDisplayed("ad-join"));
   js_checker().ExpectFalse(std::string(kAdMachineNameInput) + ".isInvalid");
   js_checker().ExpectTrue(std::string(kAdUsernameInput) + ".isInvalid");