Revert of Implemented OwnerSettingsService::Set() method.

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/linked_ptr.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/ownership/owner_settings_service.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"
 
@@ skipping 106 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.
-  //
-  // 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,
@@ skipping 11 matching lines @@
   bool HasPrivateOwnerKey();
 
   // Sets the identity of the user that's interacting with the service. This is
   // relevant only for writing settings through SignAndStore().
   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);
+  void Enqueue(SessionManagerOperation* operation);
 
   // Enqueues a load operation.
   void EnqueueLoad(bool force_key_load);
 
-  // Enqueues a sign and store operation.
-  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);
 
+  // Called by OwnerSettingsService when sign-and-store operation completes.
+  void OnSignAndStoreOperationCompleted(Status status);
+
+  void set_policy_data(
+      scoped_ptr<enterprise_management::PolicyData> policy_data) {
+    policy_data_ = policy_data.Pass();
+  }
+
+  void set_device_settings(scoped_ptr<
+      enterprise_management::ChromeDeviceSettingsProto> device_settings) {
+    device_settings_ = device_settings.Pass();
+  }
+
   SessionManagerClient* session_manager_client_;
   scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
   Status store_status_;
 
   std::vector<OwnershipStatusCallback> pending_ownership_status_callbacks_;
 
   std::string username_;
   scoped_refptr<ownership::PublicKey> public_key_;
   base::WeakPtr<ownership::OwnerSettingsService> owner_settings_service_;
 
   scoped_ptr<enterprise_management::PolicyData> policy_data_;
   scoped_ptr<enterprise_management::ChromeDeviceSettingsProto> device_settings_;
 
   // The queue of pending operations. The first operation on the queue is
   // currently active; it gets removed and destroyed once it completes.
-  std::deque<linked_ptr<SessionManagerOperation>> pending_operations_;
+  std::deque<SessionManagerOperation*> pending_operations_;
 
-  ObserverList<Observer> observers_;
+  ObserverList<Observer, true> observers_;
 
   // For recoverable load errors how many retries are left before we give up.
   int load_retries_left_;
 
   base::WeakPtrFactory<DeviceSettingsService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceSettingsService);
 };
 
 // Helper class for tests. Initializes the DeviceSettingsService singleton on
 // construction and tears it down again on destruction.
 class ScopedTestDeviceSettingsService {
  public:
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_