SetManagementSettings() is moved to OwnerSettingsServiceChromeOS.

chrome/browser/chromeos/settings/device_settings_service.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 113 matching lines @@
 
   // Returns the status generated by the last operation.
   Status status() {
     return store_status_;
   }
 
   // Triggers an attempt to pull the public half of the owner key from disk and
   // 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.
   void Store(scoped_ptr<enterprise_management::PolicyFetchResponse> policy,
              const base::Closure& callback);
 
   // Returns the ownership status. May return OWNERSHIP_UNKNOWN if the disk
   // hasn't been checked yet.
   OwnershipStatus GetOwnershipStatus();
 
   // Determines the ownership status and reports the result to |callback|. This
   // is guaranteed to never return OWNERSHIP_UNKNOWN.
   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);
 
   const std::string& GetUsername() const;
 
   ownership::OwnerSettingsService* GetOwnerSettingsService() const;
 
   // Adds an observer.
   void AddObserver(Observer* observer);
   // Removes an observer.
   void RemoveObserver(Observer* observer);
 
   // SessionManagerClient::Observer:
   virtual void OwnerKeySet(bool success) override;
   virtual void PropertyChangeComplete(bool success) override;
 
  private:
   friend class OwnerSettingsServiceChromeOS;
 
   // Enqueues a new operation. Takes ownership of |operation| and starts it
   // right away if there is no active operation currently.
   void Enqueue(const linked_ptr<SessionManagerOperation>& operation);
 
   // 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);
 
   // Runs the next pending operation.
   void StartNextOperation();
 
   // Updates status, policy data and owner key from a finished operation.
   // Starts the next pending operation if available.
   void HandleCompletedOperation(const base::Closure& callback,
@@ skipping 38 matching lines @@
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_