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

chrome/browser/chromeos/settings/session_manager_operation.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_SESSION_MANAGER_OPERATION_H_
 #define CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_validator.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "components/ownership/owner_settings_service.h"
 #include "net/cert/x509_util_nss.h"
 
 namespace enterprise_management {
 class ChromeDeviceSettingsProto;
 class PolicyData;
 class PolicyFetchResponse;
 }
 
 namespace ownership {
 class OwnerKeyUtil;
@@ skipping 38 matching lines @@
 
   // Whether the load operation is underway.
   bool is_loading() const { return is_loading_; }
 
   void set_force_key_load(bool force_key_load) {
     force_key_load_ = force_key_load;
   }
 
   void set_username(const std::string& username) { username_ = username; }
 
-  void set_owner_settings_service(const base::WeakPtr<
-      ownership::OwnerSettingsService>& owner_settings_service) {
-    owner_settings_service_ = owner_settings_service;
+  void set_delegate(const base::WeakPtr<
+      DeviceSettingsService::PrivateKeyDelegate>& delegate) {
+    delegate_ = delegate;
   }
 
  protected:
   // Runs the operation. The result is reported through |callback_|.
   virtual void Run() = 0;
 
   // Ensures the public key is loaded.
   void EnsurePublicKey(const base::Closure& callback);
 
   // Starts a load operation.
   void StartLoading();
 
   // Reports the result status of the operation. Once this gets called, the
   // operation should not perform further processing or trigger callbacks.
   void ReportResult(DeviceSettingsService::Status status);
 
   SessionManagerClient* session_manager_client() {
     return session_manager_client_;
   }
 
-  base::WeakPtr<ownership::OwnerSettingsService> owner_settings_service_;
+  base::WeakPtr<DeviceSettingsService::PrivateKeyDelegate> delegate_;
 
  private:
   // Loads the owner key from disk. Must be run on a thread that can do I/O.
   static scoped_refptr<ownership::PublicKey> LoadPublicKey(
       scoped_refptr<ownership::OwnerKeyUtil> util,
       scoped_refptr<ownership::PublicKey> current_key);
 
   // Stores the owner key loaded by LoadOwnerKey and calls |callback|.
   void StorePublicKey(const base::Closure& callback,
                       scoped_refptr<ownership::PublicKey> new_key);
@@ skipping 90 matching lines @@
   scoped_ptr<enterprise_management::PolicyData> new_policy_;
 
   base::WeakPtrFactory<SignAndStoreSettingsOperation> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SignAndStoreSettingsOperation);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_SESSION_MANAGER_OPERATION_H_