SetManagementSettings() is moved to OwnerSettingsServiceChromeOS.

chrome/browser/chromeos/settings/device_settings_service.h

Index: chrome/browser/chromeos/settings/device_settings_service.h
diff --git a/chrome/browser/chromeos/settings/device_settings_service.h b/chrome/browser/chromeos/settings/device_settings_service.h
index 499190f0da45bd4cca512faff6022c3b0c84c67d..30daad4f2c5c92ffbd7b9094c0f0c96385fbd896 100644
--- a/chrome/browser/chromeos/settings/device_settings_service.h
+++ b/chrome/browser/chromeos/settings/device_settings_service.h
@@ -131,16 +131,6 @@ class DeviceSettingsService : public SessionManagerClient::Observer {
   // load the device settings.
   void Load();
 
-  // Sets the management related settings in PolicyData.
-  //
-  // TODO (ygorshenin@, crbug.com/230018): move this to the
-  // OwnerSettingsService.
-  void SetManagementSettings(
-      enterprise_management::PolicyData::ManagementMode management_mode,
-      const std::string& request_token,
-      const std::string& device_id,
-      const base::Closure& callback);
-
   // Stores a policy blob to session_manager. The result of the operation is
   // reported through |callback|. If successful, the updated device settings are
   // present in policy_data() and device_settings() when the callback runs.
@@ -156,10 +146,20 @@ class DeviceSettingsService : public SessionManagerClient::Observer {
   void GetOwnershipStatusAsync(const OwnershipStatusCallback& callback);
 
   // Checks whether we have the private owner key.
+  //
+  // DEPRECATED (ygorshenin@, crbug.com/433840): this method should
+  // not be used since private key is a profile-specific resource and
+  // should be checked and used in a profile-aware manner, through
+  // OwnerSettingsService.
   bool HasPrivateOwnerKey();
 
   // Sets the identity of the user that's interacting with the service. This is
   // relevant only for writing settings through SignAndStore().
+  //
+  // TODO (ygorshenin@, crbug.com/433840): get rid of the method when
+  // write path for device settings will be removed from
+  // DeviceSettingsProvider and all existing clients will be switched
+  // to OwnerSettingsServiceCHromeOS.

[Mattias Nissler (ping if slow), 2014/12/03 09:07:54]

nit: lower-case H

[ygorshenin1, 2014/12/03 15:54:05]

Done.

   void InitOwner(const std::string& username,
                  const base::WeakPtr<ownership::OwnerSettingsService>&
                      owner_settings_service);
@@ -187,13 +187,6 @@ class DeviceSettingsService : public SessionManagerClient::Observer {
   // Enqueues a load operation.
   void EnqueueLoad(bool force_key_load);
 
-  // Enqueues a sign and store operation.
-  //
-  // TODO (ygorshenin@, crbug.com/433840): extract SetManagementSettings() out
-  // of DeviceSettingsService and get rid of the method.
-  void EnqueueSignAndStore(scoped_ptr<enterprise_management::PolicyData> policy,
-                           const base::Closure& callback);
-
   // Makes sure there's a reload operation so changes to the settings (and key,
   // in case force_key_load is set) are getting picked up.
   void EnsureReload(bool force_key_load);