Fix update and enrollment flow

chrome/browser/chromeos/login/enrollment/enrollment_screen.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/chromeos/login/enrollment/enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 60 matching lines @@
 
 EnrollmentScreen::~EnrollmentScreen() {
   if (remora_controller_)
     remora_controller_->RemoveObserver(this);
 }
 
 void EnrollmentScreen::SetParameters(
     EnrollmentScreenActor::EnrollmentMode enrollment_mode,
     const std::string& management_domain,
     const std::string& user,
-    const std::string& auth_token,
     pairing_chromeos::ControllerPairingController* shark_controller,
     pairing_chromeos::HostPairingController* remora_controller) {
   enrollment_mode_ = enrollment_mode;
   user_ = user.empty() ? user : gaia::CanonicalizeEmail(user);
-  auth_token_ = auth_token;
   shark_controller_ = shark_controller;
   if (remora_controller_)
     remora_controller_->RemoveObserver(this);
   remora_controller_ = remora_controller;
   if (remora_controller_)
     remora_controller_->AddObserver(this);
   actor_->SetParameters(this, enrollment_mode_, management_domain);
 }
 
 void EnrollmentScreen::PrepareToShow() {
   actor_->PrepareToShow();
 }
 
 void EnrollmentScreen::Show() {
   if (is_auto_enrollment() && !enrollment_failed_once_) {
     actor_->Show();
     UMA(policy::kMetricEnrollmentAutoStarted);
     actor_->ShowEnrollmentSpinnerScreen();
     actor_->FetchOAuthToken();
-  } else if (auth_token_.empty()) {
+  } else {
     UMA(policy::kMetricEnrollmentTriggered);
     actor_->ResetAuth(base::Bind(&EnrollmentScreen::ShowSigninScreen,
                                  weak_ptr_factory_.GetWeakPtr()));
-  } else {
-    actor_->Show();
-    actor_->ShowEnrollmentSpinnerScreen();
-    OnOAuthTokenAvailable(auth_token_);
   }
 }
 
 void EnrollmentScreen::Hide() {
   actor_->Hide();
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 std::string EnrollmentScreen::GetName() const {
   return WizardController::kEnrollmentScreenName;
 }
 
 void EnrollmentScreen::PairingStageChanged(Stage new_stage) {
   DCHECK(remora_controller_);
   if (new_stage == HostPairingController::STAGE_FINISHED) {
     remora_controller_->RemoveObserver(this);
     remora_controller_ = NULL;
-    // TODO(zork): Check that this is the best exit status. crbug.com/412798
-    get_screen_observer()->OnExit(
-        WizardController::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
+    OnConfirmationClosed();
   }
 }
 
 void EnrollmentScreen::ConfigureHost(bool accepted_eula,
                                      const std::string& lang,
                                      const std::string& timezone,
                                      bool send_reports,
                                      const std::string& keyboard_layout) {
 }
 
 void EnrollmentScreen::EnrollHost(const std::string& auth_token) {
   // TODO(achuith, zork): Move this to ConfigureHost (crbug.com/419512).
   StartupUtils::MarkEulaAccepted();
 
   actor_->Show();
   actor_->ShowEnrollmentSpinnerScreen();
   OnOAuthTokenAvailable(auth_token);
+  if (remora_controller_) {
+    remora_controller_->OnEnrollmentStatusChanged(
+        HostPairingController::ENROLLMENT_STATUS_ENROLLING);
+  }
 }
 
 void EnrollmentScreen::OnLoginDone(const std::string& user) {
   elapsed_timer_.reset(new base::ElapsedTimer());
   user_ = gaia::CanonicalizeEmail(user);
 
   if (is_auto_enrollment())
     UMA(policy::kMetricEnrollmentAutoRestarted);
   else if (enrollment_failed_once_)
     UMA(policy::kMetricEnrollmentRestarted);
@@ skipping 158 matching lines @@
 
 void EnrollmentScreen::ReportEnrollmentStatus(policy::EnrollmentStatus status) {
   switch (status.status()) {
     case policy::EnrollmentStatus::STATUS_SUCCESS:
       StartupUtils::MarkDeviceRegistered(
           base::Bind(&EnrollmentScreen::ShowEnrollmentStatusOnSuccess,
                      weak_ptr_factory_.GetWeakPtr(),
                      status));
       UMA(is_auto_enrollment() ? policy::kMetricEnrollmentAutoOK
                                : policy::kMetricEnrollmentOK);
-      if (remora_controller_)
-        remora_controller_->SetEnrollmentComplete(true);
+      if (remora_controller_) {
+        remora_controller_->OnEnrollmentStatusChanged(
+            HostPairingController::ENROLLMENT_STATUS_SUCCESS);
+      }
       return;
     case policy::EnrollmentStatus::STATUS_REGISTRATION_FAILED:
     case policy::EnrollmentStatus::STATUS_POLICY_FETCH_FAILED:
       switch (status.client_status()) {
         case policy::DM_STATUS_SUCCESS:
           NOTREACHED();
           break;
         case policy::DM_STATUS_REQUEST_INVALID:
           UMAFailure(policy::kMetricEnrollmentRegisterPolicyPayloadInvalid);
           break;
@@ skipping 72 matching lines @@
       UMAFailure(policy::kMetricEnrollmentRobotRefreshTokenStoreFailed);
       break;
     case policy::EnrollmentStatus::STATUS_STORE_TOKEN_AND_ID_FAILED:
       // This error should not happen for enterprise enrollment, it only affects
       // consumer enrollment.
       UMAFailure(policy::kMetricEnrollmentStoreTokenAndIdFailed);
       NOTREACHED();
       break;
   }
 
-  if (remora_controller_)
-    remora_controller_->SetEnrollmentComplete(false);
+  if (remora_controller_) {
+    remora_controller_->OnEnrollmentStatusChanged(
+        HostPairingController::ENROLLMENT_STATUS_FAILURE);
+  }
   enrollment_failed_once_ = true;
   if (elapsed_timer_)
     UMA_ENROLLMENT_TIME("Enterprise.EnrollmentTime.Failure", elapsed_timer_);
   actor_->ShowEnrollmentStatus(status);
 }
 
 void EnrollmentScreen::UMA(policy::MetricEnrollment sample) {
   switch (enrollment_mode_) {
     case EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL:
     case EnrollmentScreenActor::ENROLLMENT_MODE_AUTO:
@@ skipping 16 matching lines @@
     sample = policy::kMetricEnrollmentAutoFailed;
   UMA(sample);
 }
 
 void EnrollmentScreen::ShowSigninScreen() {
   actor_->Show();
   actor_->ShowSigninScreen();
 }
 
 }  // namespace chromeos