OwnerKeyUtil 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/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;
+class PublicKey;
+}
+
 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.
 //
 // The purpose of DeviceSettingsService is to keep track of the current key and
 // settings blob. For reading and writing device settings, use CrosSettings
 // instead, which provides a high-level interface that allows for manipulation
@@ skipping 85 matching lines @@
   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);
+                         scoped_refptr<ownership::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();
   }
 
   // Returns the currently used owner key.
-  scoped_refptr<PublicKey> GetPublicKey();
+  scoped_refptr<ownership::PublicKey> GetPublicKey();
 
   // Returns the status generated by the last operation.
   Status status() {
     return store_status_;
   }
 
   // Triggers an attempt to pull the public half of the owner key from disk and
   // load the device settings.
   void Load();
 
@@ skipping 78 matching lines @@
       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<OwnerKeyUtil> owner_key_util_;
+  scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
   Status store_status_;
 
   std::vector<OwnershipStatusCallback> pending_ownership_status_callbacks_;
 
   std::string username_;
-  scoped_refptr<PublicKey> public_key_;
+  scoped_refptr<ownership::PublicKey> public_key_;
   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 13 matching lines @@
   ScopedTestDeviceSettingsService();
   ~ScopedTestDeviceSettingsService();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScopedTestDeviceSettingsService);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_SETTINGS_DEVICE_SETTINGS_SERVICE_H_