Revert of Make Hands-Off Zero-Touch Enrollment compatibile with tests

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/callback.h"
 #include "base/logging.h"
@@ skipping 39 matching lines @@
     "Enterprise.EnrollmentTime.Failure";
 const char * const kMetricEnrollmentTimeSuccess =
     "Enterprise.EnrollmentTime.Success";
 
 // Retry policy constants.
 constexpr int kInitialDelayMS = 4 * 1000;  // 4 seconds
 constexpr double kMultiplyFactor = 1.5;
 constexpr double kJitterFactor = 0.1;           // +/- 10% jitter
 constexpr int64_t kMaxDelayMS = 8 * 60 * 1000;  // 8 minutes
 
+// Helper function. Returns true if we are using Hands Off Enrollment.
+bool UsingHandsOffEnrollment() {
+  return policy::DeviceCloudPolicyManagerChromeOS::
+             GetZeroTouchEnrollmentMode() ==
+         policy::ZeroTouchEnrollmentMode::HANDS_OFF;
+}
+
 }  // namespace
 
 namespace chromeos {
 
 // static
 EnrollmentScreen* EnrollmentScreen::Get(ScreenManager* manager) {
   return static_cast<EnrollmentScreen*>(
       manager->GetScreen(OobeScreen::SCREEN_OOBE_ENROLLMENT));
 }
 
@@ skipping 200 matching lines @@
                << " DM status=" << status.client_status();
   RecordEnrollmentErrorMetrics();
   // If the DM server does not have a device pre-provisioned for attestation-
   // based enrollment and we have a fallback authentication, show it.
   if (status.status() == policy::EnrollmentStatus::REGISTRATION_FAILED &&
       status.client_status() == policy::DM_STATUS_SERVICE_DEVICE_NOT_FOUND &&
       current_auth_ == AUTH_ATTESTATION && AdvanceToNextAuth()) {
     Show();
   } else {
     view_->ShowEnrollmentStatus(status);
-    if (WizardController::UsingHandsOffEnrollment())
+    if (UsingHandsOffEnrollment())
       AutomaticRetry();
   }
 }
 
 void EnrollmentScreen::OnOtherError(
     EnterpriseEnrollmentHelper::OtherError error) {
   RecordEnrollmentErrorMetrics();
   view_->ShowOtherError(error);
-  if (WizardController::UsingHandsOffEnrollment())
+  if (UsingHandsOffEnrollment())
     AutomaticRetry();
 }
 
 void EnrollmentScreen::OnDeviceEnrolled(const std::string& additional_token) {
   // TODO(pbond): remove this LOG once http://crbug.com/586961 is fixed.
   LOG(WARNING) << "Device is successfully enrolled.";
   if (!additional_token.empty())
     SendEnrollmentAuthToken(additional_token);
 
   enrollment_helper_->GetDeviceAttributeUpdatePermission();
@@ skipping 54 matching lines @@
 
 void EnrollmentScreen::SendEnrollmentAuthToken(const std::string& token) {
   DCHECK(shark_controller_);
   shark_controller_->OnAuthenticationDone(enrolling_user_domain_, token);
 }
 
 void EnrollmentScreen::ShowEnrollmentStatusOnSuccess() {
   retry_backoff_->InformOfRequest(true);
   if (elapsed_timer_)
     UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeSuccess, elapsed_timer_);
-  if (WizardController::UsingHandsOffEnrollment()) {
+  if (UsingHandsOffEnrollment()) {
     OnConfirmationClosed();
   } else {
     view_->ShowEnrollmentStatus(
         policy::EnrollmentStatus::ForStatus(policy::EnrollmentStatus::SUCCESS));
   }
 }
 
 void EnrollmentScreen::UMA(policy::MetricEnrollment sample) {
   EnrollmentUMA(sample, config_.mode);
 }
 
 void EnrollmentScreen::ShowSigninScreen() {
   view_->Show();
   view_->ShowSigninScreen();
 }
 
 void EnrollmentScreen::RecordEnrollmentErrorMetrics() {
   enrollment_failed_once_ = true;
   //  TODO(drcrash): Maybe create multiple metrics (http://crbug.com/640313)?
   if (elapsed_timer_)
     UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeFailure, elapsed_timer_);
 }
 
 void EnrollmentScreen::JoinDomain(OnDomainJoinedCallback on_joined_callback) {
   on_joined_callback_ = std::move(on_joined_callback);
   view_->ShowAdJoin();
 }
 
 }  // namespace chromeos