OwnerKeyUtil is moved to components/ownership.

chrome/browser/chromeos/ownership/owner_settings_service.h

Index: chrome/browser/chromeos/ownership/owner_settings_service.h
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service.h b/chrome/browser/chromeos/ownership/owner_settings_service.h
index b0e53c521278d8c56f30f5ccc155f3593358909b..d33a0ba421d41d1dc7785553432fa474296d1afa 100644
--- a/chrome/browser/chromeos/ownership/owner_settings_service.h
+++ b/chrome/browser/chromeos/ownership/owner_settings_service.h
@@ -14,10 +14,10 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
-#include "chrome/browser/chromeos/settings/owner_key_util.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/tpm_token_loader.h"
 #include "components/keyed_service/core/keyed_service.h"
+#include "components/ownership/owner_key_util.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -76,11 +76,13 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate,
                                       const IsOwnerCallback& callback);
 
   static void SetOwnerKeyUtilForTesting(
-      const scoped_refptr<OwnerKeyUtil>& owner_key_util);
+      const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util);
 
   static void SetDeviceSettingsServiceForTesting(
       DeviceSettingsService* device_settings_service);
 
+  static scoped_refptr<ownership::OwnerKeyUtil> MakeOwnerKeyUtil();

[stevenjb, 2014/08/26 16:36:43]

nit: Non ForTesting method before testing methods.

[ygorshenin1, 2014/08/27 20:39:12]

Done.

+
  private:
   friend class OwnerSettingsServiceFactory;
 
@@ -91,8 +93,8 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate,
   void ReloadPrivateKey();
 
   // Called when ReloadPrivateKey() completes it's work.
-  void OnPrivateKeyLoaded(scoped_refptr<PublicKey> public_key,
-                          scoped_refptr<PrivateKey> private_key);
+  void OnPrivateKeyLoaded(scoped_refptr<ownership::PublicKey> public_key,
+                          scoped_refptr<ownership::PrivateKey> private_key);
 
   // Puts request to perform sign-and-store operation in the queue.
   void EnqueueSignAndStore(scoped_ptr<enterprise_management::PolicyData> policy,
@@ -112,7 +114,7 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate,
 
   // Returns testing instance of OwnerKeyUtil when it's set, otherwise
   // returns |owner_key_util_|.
-  scoped_refptr<OwnerKeyUtil> GetOwnerKeyUtil();
+  scoped_refptr<ownership::OwnerKeyUtil> GetOwnerKeyUtil();
 
   // Returns testing instance of DeviceSettingsService when it's set,
   // otherwise returns pointer to a singleton instance, when it's
@@ -125,11 +127,11 @@ class OwnerSettingsService : public DeviceSettingsService::PrivateKeyDelegate,
   // User ID this service instance belongs to.
   std::string user_id_;
 
-  scoped_refptr<PublicKey> public_key_;
+  scoped_refptr<ownership::PublicKey> public_key_;
 
-  scoped_refptr<PrivateKey> private_key_;
+  scoped_refptr<ownership::PrivateKey> private_key_;
 
-  scoped_refptr<OwnerKeyUtil> owner_key_util_;
+  scoped_refptr<ownership::OwnerKeyUtil> owner_key_util_;
 
   std::vector<IsOwnerCallback> pending_is_owner_callbacks_;