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

chrome/browser/chromeos/login/screens/eula_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/screens/eula_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/eula_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 
 namespace chromeos {
 namespace {
 
 constexpr const char kUserActionAcceptButtonClicked[] = "accept-button";
 constexpr const char kUserActionBackButtonClicked[] = "back-button";
 constexpr const char kContextKeyUsageStatsEnabled[] = "usageStatsEnabled";
@@ skipping 51 matching lines @@
 
 void EulaScreen::OnViewDestroyed(EulaView* view) {
   if (view_ == view)
     view_ = NULL;
 }
 
 void EulaScreen::Show() {
   // Command to own the TPM.
   DBusThreadManager::Get()->GetCryptohomeClient()->TpmCanAttemptOwnership(
       EmptyVoidDBusMethodCallback());
-  if (WizardController::UsingHandsOffEnrollment())
+  if (policy::DeviceCloudPolicyManagerChromeOS::GetZeroTouchEnrollmentMode() ==
+      policy::ZeroTouchEnrollmentMode::HANDS_OFF)
     OnUserAction(kUserActionAcceptButtonClicked);
   else if (view_)
     view_->Show();
 }
 
 void EulaScreen::Hide() {
   if (view_)
     view_->Hide();
 }
 
@@ skipping 14 matching lines @@
   }
 }
 
 void EulaScreen::OnPasswordFetched(const std::string& tpm_password) {
   tpm_password_ = tpm_password;
   if (view_)
     view_->OnPasswordFetched(tpm_password_);
 }
 
 }  // namespace chromeos