Rewrite of the EnrollEnterpriseDevice PyAuto automation hook for WebUI.

chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
@@ skipping 134 matching lines @@
 
 void EnterpriseOAuthEnrollmentScreenHandler::Hide() {
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowConfirmationScreen() {
   UMA(is_auto_enrollment_ ? policy::kMetricEnrollmentAutoOK :
                             policy::kMetricEnrollmentOK);
   ShowStep(kEnrollmentStepSuccess);
   if (!is_auto_enrollment_ || enrollment_failed_once_)
     ResetAuth();
-  NotifyObservers(true);
+  NotifyObservers(true, "");
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowAuthError(
     const GoogleServiceAuthError& error) {
   switch (error.state()) {
     case GoogleServiceAuthError::NONE:
     case GoogleServiceAuthError::CAPTCHA_REQUIRED:
     case GoogleServiceAuthError::TWO_FACTOR:
     case GoogleServiceAuthError::HOSTED_NOT_ALLOWED:
     case GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS:
@@ skipping 13 matching lines @@
       ShowNetworkEnrollmentError();
       return;
   }
   UMAFailure(policy::kMetricEnrollmentOtherFailed);
   NOTREACHED();
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowAccountError() {
   UMAFailure(policy::kMetricEnrollmentNotSupported);
   ShowError(IDS_ENTERPRISE_ENROLLMENT_ACCOUNT_ERROR, true);
-  NotifyObservers(false);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowSerialNumberError() {
   UMAFailure(policy::kMetricEnrollmentInvalidSerialNumber);
   ShowError(IDS_ENTERPRISE_ENROLLMENT_SERIAL_NUMBER_ERROR, true);
-  NotifyObservers(false);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowEnrollmentModeError() {
   UMAFailure(policy::kMetricEnrollmentInvalidEnrollmentMode);
   ShowError(IDS_ENTERPRISE_ENROLLMENT_MODE_ERROR, false);
-  NotifyObservers(false);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowFatalAuthError() {
   UMAFailure(policy::kMetricEnrollmentLoginFailed);
   ShowError(IDS_ENTERPRISE_ENROLLMENT_FATAL_AUTH_ERROR, false);
-  NotifyObservers(false);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowFatalEnrollmentError() {
   UMAFailure(policy::kMetricEnrollmentOtherFailed);
   ShowError(IDS_ENTERPRISE_ENROLLMENT_FATAL_ENROLLMENT_ERROR, false);
-  NotifyObservers(false);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowAutoEnrollmentError() {
   UMAFailure(policy::kMetricEnrollmentAutoEnrollmentNotSupported);
   // The reason for showing this error is that we have been trying to
   // auto-enroll and this failed, so we have to verify whether auto-enrollment
   // is on, and if so switch it off, update the UI accordingly and show the
   // error message.
   std::string user;
   is_auto_enrollment_ = controller_ && controller_->IsAutoEnrollment(&user);
   base::FundamentalValue value(is_auto_enrollment_);
   web_ui()->CallJavascriptFunction(
       "oobe.OAuthEnrollmentScreen.setIsAutoEnrollment", value);
 
   ShowError(IDS_ENTERPRISE_AUTO_ENROLLMENT_ERROR, false);
-  NotifyObservers(false);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowNetworkEnrollmentError() {
   UMAFailure(policy::kMetricEnrollmentNetworkFailed);
   ShowError(IDS_ENTERPRISE_ENROLLMENT_NETWORK_ENROLLMENT_ERROR, true);
-  NotifyObservers(false);
-}
-
-void EnterpriseOAuthEnrollmentScreenHandler::SubmitTestCredentials(
-    const std::string& email,
-    const std::string& password) {
-  test_email_ = email;
-  test_password_ = password;
-  DoShow();
 }
 
 // EnterpriseOAuthEnrollmentScreenHandler BaseScreenHandler implementation -----
 
 void EnterpriseOAuthEnrollmentScreenHandler::Initialize() {
   if (show_on_init_) {
     Show();
     show_on_init_ = false;
   }
 }
@@ skipping 138 matching lines @@
     action_on_browsing_data_removed_ =
         base::Bind(&EnterpriseOAuthEnrollmentScreenHandler::DoClose,
                    base::Unretained(this),
                    true);
     ResetAuth();
   } else {
     // Not going back to sign-in, letting the initial sign-in resume instead.
     // In that case, keep the profile data.
     DoClose(false);
   }
+
+  NotifyObservers(false, "Oauth enrollment cancelled");

[Mattias Nissler (ping if slow), 2012/05/25 13:17:22]

Should be "OAuth" (capital A). Also, I feel a bit bad of having literal string
in the code that's just for automation. Ccould you add a comment saying that
this string is just for automation? 

[craigdh, 2012/05/25 23:24:47]

Done. Including a string literal is certainly not ideal, but it beats having
tests fail with no error message.

 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::HandleCompleteLogin(
     const base::ListValue* value) {
   if (!controller_) {
     NOTREACHED();
     return;
   }
 
   std::string user;
@@ skipping 48 matching lines @@
                                                        bool retry) {
   RevokeTokens();
   enrollment_failed_once_ = true;
 
   const std::string message(l10n_util::GetStringUTF8(message_id));
   base::StringValue message_value(message);
   base::FundamentalValue retry_value(retry);
   web_ui()->CallJavascriptFunction("oobe.OAuthEnrollmentScreen.showError",
                                    message_value,
                                    retry_value);
+  NotifyObservers(false, message);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowWorking(int message_id) {
   const std::string message(l10n_util::GetStringUTF8(message_id));
   base::StringValue message_value(message);
   web_ui()->CallJavascriptFunction("oobe.OAuthEnrollmentScreen.showWorking",
                                    message_value);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ResetAuth() {
@@ skipping 57 matching lines @@
   controller_->OnConfirmationClosed(back_to_signin);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::UMAFailure(int sample) {
   if (is_auto_enrollment_)
     sample = policy::kMetricEnrollmentAutoFailed;
   UMA(sample);
 }
 
 }  // namespace chromeos