Revert of Non-plafrom-specific part of an OwnerSettingsService is moved to components/ownership/*.

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/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"
 
 namespace crypto {
 class RSAPrivateKey;
 }
 
 namespace ownership {
 class OwnerKeyUtil;
@@ skipping 45 matching lines @@
    public:
     virtual ~Observer();
 
     // Indicates device ownership status changes.
     virtual void OwnershipStatusChanged() = 0;
 
     // Gets call after updates to the device settings.
     virtual void DeviceSettingsUpdated() = 0;
   };
 
+  class PrivateKeyDelegate {
+   public:
+    typedef base::Callback<void(bool is_owner)> IsOwnerCallback;
+    typedef base::Callback<void(std::string policy_blob)>
+        AssembleAndSignPolicyCallback;
+
+    virtual ~PrivateKeyDelegate() {}
+
+    // Returns whether current user is owner or not. When this method
+    // is called too early, incorrect result can be returned because
+    // private key loading may be in progress.
+    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();
@@ skipping 61 matching lines @@
   // 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.
   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 base::WeakPtr<PrivateKeyDelegate>& delegate);
   const std::string& GetUsername() 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;
+  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);
 
   // 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.
@@ skipping 26 matching lines @@
 
   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_;
+  base::WeakPtr<PrivateKeyDelegate> delegate_;
 
   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<SessionManagerOperation*> pending_operations_;
 
   ObserverList<Observer, true> observers_;
 
@@ skipping 12 matching lines @@
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_