OwnerKeyUtil is moved to components/ownership.

chrome/browser/chromeos/settings/session_manager_operation.h

Index: chrome/browser/chromeos/settings/session_manager_operation.h
diff --git a/chrome/browser/chromeos/settings/session_manager_operation.h b/chrome/browser/chromeos/settings/session_manager_operation.h
index 978384a6736ab25b64c2b1ca472c74ab04d3af6c..a7484b521853f708a71f042db94060c1fce2cae9 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation.h
+++ b/chrome/browser/chromeos/settings/session_manager_operation.h
@@ -19,9 +19,13 @@ class PolicyData;
 class PolicyFetchResponse;
 }
 
+namespace ownership {
+class OwnerKeyUtil;
+class PublicKey;
+}
+
 namespace chromeos {
 
-class OwnerKeyUtil;
 class SessionManagerClient;
 
 // Handles a single transaction with session manager. This is a virtual base
@@ -38,8 +42,8 @@ class SessionManagerOperation {
 
   // Starts the operation.
   void Start(SessionManagerClient* session_manager_client,
-             scoped_refptr<OwnerKeyUtil> owner_key_util,
-             scoped_refptr<PublicKey> public_key);
+             scoped_refptr<ownership::OwnerKeyUtil> owner_key_util,
+             scoped_refptr<ownership::PublicKey> public_key);
 
   // Restarts a load operation (if that part is already in progress).
   void RestartLoad(bool key_changed);
@@ -54,7 +58,7 @@ class SessionManagerOperation {
   }
 
   // Public part of the owner key as configured/loaded from disk.
-  scoped_refptr<PublicKey> public_key() { return public_key_; }
+  scoped_refptr<ownership::PublicKey> public_key() { return public_key_; }
 
   // Whether the load operation is underway.
   bool is_loading() const { return is_loading_; }
@@ -92,13 +96,13 @@ class SessionManagerOperation {
 
  private:
   // Loads the owner key from disk. Must be run on a thread that can do I/O.
-  static scoped_refptr<PublicKey> LoadPublicKey(
-      scoped_refptr<OwnerKeyUtil> util,
-      scoped_refptr<PublicKey> current_key);
+  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<PublicKey> new_key);
+                      scoped_refptr<ownership::PublicKey> new_key);
 
   // Triggers a device settings load.
   void RetrieveDeviceSettings();
@@ -110,13 +114,13 @@ class SessionManagerOperation {
   void ReportValidatorStatus(policy::DeviceCloudPolicyValidator* validator);
 
   SessionManagerClient* session_manager_client_;
-  scoped_refptr<OwnerKeyUtil> owner_key_util_;
+  scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
   base::WeakPtrFactory<SessionManagerOperation> weak_factory_;
 
   Callback callback_;
 
-  scoped_refptr<PublicKey> public_key_;
+  scoped_refptr<ownership::PublicKey> public_key_;
   bool force_key_load_;
   std::string username_;