SetManagementSettings() is moved to OwnerSettingsServiceChromeOS.

chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 23 matching lines @@
 // profile is created and TPM token is ready. Note that the private part of a
 // key can be loaded only for the owner.
 //
 // TODO (ygorshenin@): move write path for device settings here
 // (crbug.com/230018).
 class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService,
                                      public content::NotificationObserver,
                                      public SessionManagerClient::Observer,
                                      public DeviceSettingsService::Observer {
  public:
+  struct ManagementSettingsSetRequest {
+    ManagementSettingsSetRequest();
+    ~ManagementSettingsSetRequest();
+
+    typedef base::Callback<void(bool success)> RequestProcessedCallback;
+
+    enterprise_management::PolicyData::ManagementMode management_mode;
+    std::string request_token;
+    std::string device_id;
+    RequestProcessedCallback callback;
+  };
+
   virtual ~OwnerSettingsServiceChromeOS();
 
   void OnTPMTokenReady(bool tpm_token_enabled);
 
   // ownership::OwnerSettingsService implementation:
   virtual bool HandlesSetting(const std::string& setting) override;
   virtual bool Set(const std::string& setting,
                    const base::Value& value) override;
   virtual bool CommitTentativeDeviceSettings(
       scoped_ptr<enterprise_management::PolicyData> policy) override;
 
   // NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
 
   // SessionManagerClient::Observer:
   virtual void OwnerKeySet(bool success) override;
 
   // DeviceSettingsService::Observer:
   virtual void OwnershipStatusChanged() override;
   virtual void DeviceSettingsUpdated() override;
   virtual void OnDeviceSettingsServiceShutdown() override;
 
+  // Sets the management related settings.
+  void SetManagementSettings(const ManagementSettingsSetRequest& request);
+
   // Checks if the user is the device owner, without the user profile having to
   // been initialized. Should be used only if login state is in safe mode.
   static void IsOwnerForSafeModeAsync(
       const std::string& user_hash,
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util,
       const IsOwnerCallback& callback);
 
   // Assembles PolicyData based on |settings|, |policy_data| and
   // |user_id|.
   static scoped_ptr<enterprise_management::PolicyData> AssemblePolicy(
       const std::string& user_id,
       const enterprise_management::PolicyData* policy_data,
       const enterprise_management::ChromeDeviceSettingsProto* settings);
 
   // Updates device |settings|.
   static void UpdateDeviceSettings(
       const std::string& path,
       const base::Value& value,
       enterprise_management::ChromeDeviceSettingsProto& settings);
 
   bool has_pending_changes() const {
-    return !pending_changes_.empty() || tentative_settings_.get();
+    return !pending_changes_.empty() || tentative_settings_.get() ||
+           !pending_management_settings_set_requests_.empty();
   }
 
  private:
   friend class OwnerSettingsServiceChromeOSFactory;
 
   OwnerSettingsServiceChromeOS(
       DeviceSettingsService* device_settings_service,
       Profile* profile,
       const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
 
@@ skipping 34 matching lines @@
 
   // Whether profile still needs to be initialized.
   bool waiting_for_profile_creation_;
 
   // Whether TPM token still needs to be initialized.
   bool waiting_for_tpm_token_;
 
   // A set of pending changes to device settings.
   base::ScopedPtrHashMap<std::string, base::Value> pending_changes_;
 
+  // A set of pending changes to management settings.
+  std::vector<ManagementSettingsSetRequest>
+      pending_management_settings_set_requests_;

[Mattias Nissler (ping if slow), 2014/12/02 08:52:40]

I think we only ever need to store one of these. If there's another change
coming in, we'll just overwrite anyways.

[ygorshenin1, 2014/12/02 19:18:58]

Done.

+
+  // A set of callbacks that need to be run after signed policy is
+  // stored.
+  std::vector<ManagementSettingsSetRequest::RequestProcessedCallback>
+      pending_callbacks_;
+
   // A protobuf containing pending changes to device settings.
   scoped_ptr<enterprise_management::ChromeDeviceSettingsProto>
       tentative_settings_;
 
   content::NotificationRegistrar registrar_;
 
   base::WeakPtrFactory<OwnerSettingsServiceChromeOS> weak_factory_;
 
   base::WeakPtrFactory<OwnerSettingsServiceChromeOS> store_settings_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OwnerSettingsServiceChromeOS);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OWNERSHIP_OWNER_SETTINGS_SERVICE_CHROMEOS_H_