| Index: chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
|
| diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
|
| index c7455930a4edb6e6108194dd750813deeb1b41bb..e0a8da6dda9c3f06b21d09930328dc8f1bcd6661 100644
|
| --- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
|
| +++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
|
| @@ -96,6 +96,7 @@ void DeviceCloudPolicyInitializer::Shutdown() {
|
| void DeviceCloudPolicyInitializer::StartEnrollment(
|
| ManagementMode management_mode,
|
| DeviceManagementService* device_management_service,
|
| + chromeos::OwnerSettingsServiceChromeOS* owner_settings_service,
|
| const std::string& auth_token,
|
| const AllowedDeviceModes& allowed_device_modes,
|
| const EnrollmentCallback& enrollment_callback) {
|
| @@ -104,20 +105,13 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
|
|
|
| manager_->core()->Disconnect();
|
| enrollment_handler_.reset(new EnrollmentHandlerChromeOS(
|
| - device_store_,
|
| - install_attributes_,
|
| - state_keys_broker_,
|
| - device_settings_service_,
|
| - CreateClient(device_management_service),
|
| - background_task_runner_,
|
| - auth_token,
|
| - install_attributes_->GetDeviceId(),
|
| - manager_->GetDeviceRequisition(),
|
| - allowed_device_modes,
|
| - management_mode,
|
| + device_store_, install_attributes_, state_keys_broker_,
|
| + device_settings_service_, owner_settings_service,
|
| + CreateClient(device_management_service), background_task_runner_,
|
| + auth_token, install_attributes_->GetDeviceId(),
|
| + manager_->GetDeviceRequisition(), allowed_device_modes, management_mode,
|
| base::Bind(&DeviceCloudPolicyInitializer::EnrollmentCompleted,
|
| - base::Unretained(this),
|
| - enrollment_callback)));
|
| + base::Unretained(this), enrollment_callback)));
|
| enrollment_handler_->StartEnrollment();
|
| }
|
|
|
|
|