Delete obsolete AllowedDeviceModes enrollment parameter.

Also remove (apparently obsolete) code to tolerate unset device mode in
registration responses.

BUG=none

Review-Url: https://codereview.chromium.org/2329303002
Cr-Commit-Position: refs/heads/master@{#417977}

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

@@ -157,16 +157,12 @@ void EnterpriseEnrollmentHelperImpl::DoEnroll(const std::string& token) {
     return;
   }
 
-  policy::DeviceCloudPolicyInitializer::AllowedDeviceModes device_modes;
-  device_modes[policy::DEVICE_MODE_ENTERPRISE] = true;
   connector->ScheduleServiceInitialization(0);
-
   policy::DeviceCloudPolicyInitializer* dcp_initializer =
       connector->GetDeviceCloudPolicyInitializer();
   CHECK(dcp_initializer);
   dcp_initializer->StartEnrollment(
       connector->device_management_service(), enrollment_config_, token,
-      device_modes,
       base::Bind(&EnterpriseEnrollmentHelperImpl::OnEnrollmentFinished,
                  weak_ptr_factory_.GetWeakPtr()));
 }

chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

@@ -110,7 +110,6 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
     DeviceManagementService* device_management_service,
     const EnrollmentConfig& enrollment_config,
     const std::string& auth_token,
-    const AllowedDeviceModes& allowed_device_modes,
     const EnrollmentCallback& enrollment_callback) {
   DCHECK(is_initialized_);
   DCHECK(!enrollment_handler_);
@@ -121,7 +120,6 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
       attestation_flow_.get(), CreateClient(device_management_service),
       background_task_runner_, enrollment_config, auth_token,
       install_attributes_->GetDeviceId(), manager_->GetDeviceRequisition(),
-      allowed_device_modes,
       base::Bind(&DeviceCloudPolicyInitializer::EnrollmentCompleted,
                  base::Unretained(this), enrollment_callback)));
   enrollment_handler_->StartEnrollment();

chrome/browser/chromeos/policy/device_cloud_policy_initializer.h

@@ -5,7 +5,6 @@
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_INITIALIZER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_CLOUD_POLICY_INITIALIZER_H_
 
-#include <bitset>
 #include <memory>
 #include <string>
 
@@ -50,7 +49,6 @@ class EnterpriseInstallAttributes;
 // handles the enrollment process.
 class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
  public:
-  typedef std::bitset<32> AllowedDeviceModes;
   typedef base::Callback<void(EnrollmentStatus)> EnrollmentCallback;
 
   // |background_task_runner| is used to execute long-running background tasks
@@ -74,13 +72,10 @@ class DeviceCloudPolicyInitializer : public CloudPolicyStore::Observer {
   // Starts enrollment or re-enrollment. Once the enrollment process completes,
   // |enrollment_callback| is invoked and gets passed the status of the
   // operation.
-  // |allowed_modes| specifies acceptable DEVICE_MODE_* constants for
-  // enrollment.
   virtual void StartEnrollment(
       DeviceManagementService* device_management_service,
       const EnrollmentConfig& enrollment_config,
       const std::string& auth_token,
-      const AllowedDeviceModes& allowed_modes,
       const EnrollmentCallback& enrollment_callback);
 
   // Get the enrollment configuration that has been set up via signals such as

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc

@@ -428,6 +428,8 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
 
     register_response_.mutable_register_response()->set_device_management_token(
         PolicyBuilder::kFakeToken);
+    register_response_.mutable_register_response()->set_enrollment_type(
+        em::DeviceRegisterResponse::ENTERPRISE);
     policy_fetch_response_.mutable_policy_response()->add_response()->CopyFrom(
         device_policy_.policy());
     robot_auth_fetch_response_.mutable_service_api_access_response()
@@ -481,8 +483,6 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
         .Times(AtMost(1))
         .WillOnce(
             DoAll(SaveArg<4>(&client_id_), SaveArg<5>(&register_request_)));
-    DeviceCloudPolicyInitializer::AllowedDeviceModes modes;
-    modes[DEVICE_MODE_ENTERPRISE] = true;
 
     chromeos::OwnerSettingsServiceChromeOS* owner_settings_service =
         chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
@@ -496,7 +496,7 @@ class DeviceCloudPolicyManagerChromeOSEnrollmentTest
                                        : EnrollmentConfig::MODE_MANUAL;
     std::string token = with_cert ? "" : "auth token";
     initializer_->StartEnrollment(
-        &device_management_service_, enrollment_config, token, modes,
+        &device_management_service_, enrollment_config, token,
         base::Bind(&DeviceCloudPolicyManagerChromeOSEnrollmentTest::Done,
                    base::Unretained(this)));
     base::RunLoop().RunUntilIdle();

chrome/browser/chromeos/policy/enrollment_handler_chromeos.cc

@@ -79,7 +79,6 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
     const std::string& auth_token,
     const std::string& client_id,
     const std::string& requisition,
-    const AllowedDeviceModes& allowed_device_modes,
     const EnrollmentCallback& completion_callback)
     : store_(store),
       install_attributes_(install_attributes),
@@ -91,7 +90,6 @@ EnrollmentHandlerChromeOS::EnrollmentHandlerChromeOS(
       auth_token_(auth_token),
       client_id_(client_id),
       requisition_(requisition),
-      allowed_device_modes_(allowed_device_modes),
       completion_callback_(completion_callback),
       device_mode_(DEVICE_MODE_NOT_SET),
       skip_robot_auth_(false),
@@ -184,9 +182,7 @@ void EnrollmentHandlerChromeOS::OnRegistrationStateChanged(
   if (enrollment_step_ == STEP_REGISTRATION && client_->is_registered()) {
     enrollment_step_ = STEP_POLICY_FETCH,
     device_mode_ = client_->device_mode();
-    if (device_mode_ == DEVICE_MODE_NOT_SET)
-      device_mode_ = DEVICE_MODE_ENTERPRISE;
-    if (!allowed_device_modes_.test(device_mode_)) {
+    if (device_mode_ != policy::DEVICE_MODE_ENTERPRISE) {
       LOG(ERROR) << "Bad device mode " << device_mode_;
       ReportResult(EnrollmentStatus::ForStatus(
           EnrollmentStatus::STATUS_REGISTRATION_BAD_MODE));

chrome/browser/chromeos/policy/enrollment_handler_chromeos.h

@@ -52,16 +52,11 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,
                                   public CloudPolicyStore::Observer,
                                   public gaia::GaiaOAuthClient::Delegate {
  public:
-  typedef DeviceCloudPolicyInitializer::AllowedDeviceModes
-      AllowedDeviceModes;
   typedef DeviceCloudPolicyInitializer::EnrollmentCallback
       EnrollmentCallback;
 
   // |store| and |install_attributes| must remain valid for the life time of the
-  // enrollment handler. |allowed_device_modes| determines what device modes
-  // are acceptable. If the mode specified by the server is not acceptable,
-  // enrollment will fail with an EnrollmentStatus indicating
-  // STATUS_REGISTRATION_BAD_MODE.
+  // enrollment handler.
   EnrollmentHandlerChromeOS(
       DeviceCloudPolicyStoreChromeOS* store,
       EnterpriseInstallAttributes* install_attributes,
@@ -73,7 +68,6 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,
       const std::string& auth_token,
       const std::string& client_id,
       const std::string& requisition,
-      const AllowedDeviceModes& allowed_device_modes,
       const EnrollmentCallback& completion_callback);
   ~EnrollmentHandlerChromeOS() override;
 
@@ -177,7 +171,6 @@ class EnrollmentHandlerChromeOS : public CloudPolicyClient::Observer,
   std::string auth_token_;
   std::string client_id_;
   std::string requisition_;
-  AllowedDeviceModes allowed_device_modes_;
   EnrollmentCallback completion_callback_;
 
   // The current state key provided by |state_keys_broker_|.

chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.cc

@@ -38,7 +38,6 @@ void FakeDeviceCloudPolicyInitializer::StartEnrollment(
     DeviceManagementService* device_management_service,
     const EnrollmentConfig& enrollment_config,
     const std::string& auth_token,
-    const AllowedDeviceModes& allowed_modes,
     const EnrollmentCallback& enrollment_callback) {
   was_start_enrollment_called_ = true;
   enrollment_callback.Run(enrollment_status_);

chrome/browser/chromeos/policy/fake_device_cloud_policy_initializer.h

@@ -28,7 +28,6 @@ class FakeDeviceCloudPolicyInitializer : public DeviceCloudPolicyInitializer {
       DeviceManagementService* device_management_service,
       const EnrollmentConfig& enrollment_config,
       const std::string& auth_token,
-      const AllowedDeviceModes& allowed_modes,
       const EnrollmentCallback& enrollment_callback) override;
 
   bool was_start_enrollment_called() {