SignAndStore method is moved out from DeviceSettingsService to OwnerSettingsService. It's still cal…

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>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
+#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "crypto/scoped_nss_types.h"
 #include "policy/proto/device_management_backend.pb.h"
 
 namespace crypto {
 class RSAPrivateKey;
 }
 
-namespace enterprise_management {
-class ChromeDeviceSettingsProto;
-}
-
 namespace chromeos {
 
 class OwnerKeyUtil;
 class PublicKey;
 class SessionManagerOperation;
 
 // Deals with the low-level interface to Chromium OS device settings. Device
 // settings are stored in a protobuf that's protected by a cryptographic
 // signature generated by a key in the device owner's possession. Key and
 // settings are brokered by the session_manager daemon.
@@ skipping 55 matching lines @@
     virtual bool IsOwner() = 0;
 
     // Determines whether current user is owner or not, responds via
     // |callback|.
     virtual void IsOwnerAsync(const IsOwnerCallback& callback) = 0;
 
     // Assembles and signs |policy|, responds via |callback|.
     virtual bool AssembleAndSignPolicyAsync(
         scoped_ptr<enterprise_management::PolicyData> policy,
         const AssembleAndSignPolicyCallback& callback) = 0;
+
+    // Signs |settings| with the private half of the owner key and sends
+    // the resulting policy blob to session manager for storage. 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.
+    virtual void SignAndStoreAsync(
+        scoped_ptr<enterprise_management::ChromeDeviceSettingsProto> settings,
+        const base::Closure& callback) = 0;
+
+    // Sets the management related settings in PolicyData. Note that if
+    // |management_mode| is NOT_MANAGED, |request_token| and |device_id|
+    // should be empty strings. The result of the operation is reported
+    // through |callback|.
+    virtual void SetManagementSettingsAsync(
+        enterprise_management::PolicyData::ManagementMode management_mode,
+        const std::string& request_token,
+        const std::string& device_id,
+        const base::Closure& callback) = 0;
   };
 
   // Manage singleton instance.
   static void Initialize();
   static bool IsInitialized();
   static void Shutdown();
   static DeviceSettingsService* Get();
 
   // Creates a device settings service instance. This is meant for unit tests,
   // production code uses the singleton returned by Get() above.
   DeviceSettingsService();
   virtual ~DeviceSettingsService();
 
   // To be called on startup once threads are initialized and DBus is ready.
   void SetSessionManager(SessionManagerClient* session_manager_client,
                          scoped_refptr<OwnerKeyUtil> owner_key_util);
 
   // Prevents the service from making further calls to session_manager_client
   // and stops any pending operations.
   void UnsetSessionManager();
 
+  SessionManagerClient* session_manager_client() const {
+    return session_manager_client_;
+  }
+
   // Returns the currently active device settings. Returns NULL if the device
   // settings have not been retrieved from session_manager yet.
   const enterprise_management::PolicyData* policy_data() {
     return policy_data_.get();
   }
   const enterprise_management::ChromeDeviceSettingsProto*
       device_settings() const {
     return device_settings_.get();
   }
 
@@ skipping 11 matching lines @@
 
   // Signs |settings| with the private half of the owner key and sends the
   // resulting policy blob to session manager for storage. 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 SignAndStore(
       scoped_ptr<enterprise_management::ChromeDeviceSettingsProto> new_settings,
       const base::Closure& callback);
 
-  // Sets the management related settings in PolicyData. Note that if
-  // |management_mode| is NOT_MANAGED, |request_token| and |device_id| should be
-  // empty strings.
   void SetManagementSettings(

[pastarmovj, 2014/07/18 11:20:16]

I think you should preserve at least the first sentence of the documentation.

[ygorshenin1, 2014/07/18 11:48:47]

Done.

       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);
@@ skipping 18 matching lines @@
   // 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 OwnerSettingsService;
+
   // Enqueues a new operation. Takes ownership of |operation| and starts it
   // right away if there is no active operation currently.
   void Enqueue(SessionManagerOperation* operation);
 
   // Enqueues a load operation.
   void EnqueueLoad(bool force_key_load);
 
-  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,
                                 SessionManagerOperation* operation,
                                 Status status);
 
   // Updates status and invokes the callback immediately.
   void HandleError(Status status, const base::Closure& callback);
 
-  // Assembles PolicyData based on |settings| and the current |policy_data_|
-  // and |username_|.
-  scoped_ptr<enterprise_management::PolicyData> AssemblePolicy(
-      const enterprise_management::ChromeDeviceSettingsProto& settings) const;
+  // Called by OwnerSettingsService when sign-and-store operation completes.
+  void OnSignAndStoreOperationCompleted(Status status);
 
-  // Returns the current management mode.
-  enterprise_management::PolicyData::ManagementMode GetManagementMode() const;
+  void set_policy_data(
+      scoped_ptr<enterprise_management::PolicyData> policy_data) {
+    policy_data_ = policy_data.Pass();
+  }
 
-  // Returns true if it is okay to transfer from the current mode to the new
-  // mode. This function should be called in SetManagementMode().
-  bool CheckManagementModeTransition(
-      enterprise_management::PolicyData::ManagementMode new_mode) const;
+  void set_device_settings(scoped_ptr<
+      enterprise_management::ChromeDeviceSettingsProto> device_settings) {
+    device_settings_ = device_settings.Pass();
+  }
 
   SessionManagerClient* session_manager_client_;
   scoped_refptr<OwnerKeyUtil> owner_key_util_;
 
   Status store_status_;
 
   std::vector<OwnershipStatusCallback> pending_ownership_status_callbacks_;
 
   std::string username_;
   scoped_refptr<PublicKey> public_key_;
@@ skipping 23 matching lines @@
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_