SetManagementSettings() is moved to OwnerSettingsServiceChromeOS.

chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

 // Copyright 2014 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/policy/device_cloud_policy_initializer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
@@ skipping 79 matching lines @@
 
   device_store_->RemoveObserver(this);
   enrollment_handler_.reset();
   state_keys_update_subscription_.reset();
   is_initialized_ = false;
 }
 
 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,
     const EnrollmentCallback& enrollment_callback) {
   DCHECK(is_initialized_);
   DCHECK(!enrollment_handler_);
 
   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();
 }
 
 bool DeviceCloudPolicyInitializer::ShouldAutoStartEnrollment() const {
   const RestoreMode restore_mode = GetRestoreMode();
   if (restore_mode == RESTORE_MODE_REENROLLMENT_REQUESTED ||
       restore_mode == RESTORE_MODE_REENROLLMENT_ENFORCED) {
     return true;
   }
 
@@ skipping 106 matching lines @@
   if (!manager_->core()->service())
     manager_->StartConnection(client.Pass(), install_attributes_);
 
   if (!on_connected_callback_.is_null()) {
     on_connected_callback_.Run();
     on_connected_callback_.Reset();
   }
 }
 
 }  // namespace policy