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 e0da0675daac6bbede044a01d4670ba45bf72ae4..3f29134a697adb2628830c60820131b1f504205b 100644 |
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc |
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc |
@@ -97,6 +97,7 @@ void DeviceCloudPolicyInitializer::Shutdown() { |
void DeviceCloudPolicyInitializer::StartEnrollment( |
ManagementMode management_mode, |
DeviceManagementService* device_management_service, |
+ chromeos::OwnerSettingsServiceChromeOS* owner_settings_service, |
const std::string& auth_token, |
bool is_auto_enrollment, |
const AllowedDeviceModes& allowed_device_modes, |
@@ -106,21 +107,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(), |
- is_auto_enrollment, |
- manager_->GetDeviceRequisition(), |
- allowed_device_modes, |
- management_mode, |
+ device_store_, install_attributes_, state_keys_broker_, |
davidyu
2014/12/03 16:06:04
Put each parameter at its own line.
|
+ device_settings_service_, owner_settings_service, |
+ CreateClient(device_management_service), background_task_runner_, |
+ auth_token, install_attributes_->GetDeviceId(), is_auto_enrollment, |
+ manager_->GetDeviceRequisition(), allowed_device_modes, management_mode, |
base::Bind(&DeviceCloudPolicyInitializer::EnrollmentCompleted, |
- base::Unretained(this), |
- enrollment_callback))); |
+ base::Unretained(this), enrollment_callback))); |
enrollment_handler_->StartEnrollment(); |
} |