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

chrome/browser/chromeos/login/enrollment/enrollment_screen.cc

Index: chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
diff --git a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
index b82f94da26b8b17e9030c04594cf1e447489d995..ee08d9c854280f997194d4f073008023401461bf 100644
--- a/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
+++ b/chrome/browser/chromeos/login/enrollment/enrollment_screen.cc
@@ -57,6 +57,13 @@
 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 {
@@ -277,7 +284,7 @@
     Show();
   } else {
     view_->ShowEnrollmentStatus(status);
-    if (WizardController::UsingHandsOffEnrollment())
+    if (UsingHandsOffEnrollment())
       AutomaticRetry();
   }
 }
@@ -286,7 +293,7 @@
     EnterpriseEnrollmentHelper::OtherError error) {
   RecordEnrollmentErrorMetrics();
   view_->ShowOtherError(error);
-  if (WizardController::UsingHandsOffEnrollment())
+  if (UsingHandsOffEnrollment())
     AutomaticRetry();
 }
 
@@ -361,7 +368,7 @@
   retry_backoff_->InformOfRequest(true);
   if (elapsed_timer_)
     UMA_ENROLLMENT_TIME(kMetricEnrollmentTimeSuccess, elapsed_timer_);
-  if (WizardController::UsingHandsOffEnrollment()) {
+  if (UsingHandsOffEnrollment()) {
     OnConfirmationClosed();
   } else {
     view_->ShowEnrollmentStatus(