Split UserCloudPolicyManager implementation.

chrome/browser/profiles/profile_impl.h

Index: chrome/browser/profiles/profile_impl.h
diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h
index 6c6bb68f212396ba626a31459786bee452ad0bc8..9d3bd934438d45408ff12623ec199913ea6c8408 100644
--- a/chrome/browser/profiles/profile_impl.h
+++ b/chrome/browser/profiles/profile_impl.h
@@ -46,6 +46,10 @@ namespace extensions {
 class ExtensionSystem;
 }
 
+namespace policy {
+class CloudPolicyManager;
+}
+
 // The default profile implementation.
 class ProfileImpl : public Profile,
                     public content::NotificationObserver,
@@ -96,7 +100,6 @@ class ProfileImpl : public Profile,
   virtual ExtensionSpecialStoragePolicy*
       GetExtensionSpecialStoragePolicy() OVERRIDE;
   virtual GAIAInfoUpdateService* GetGAIAInfoUpdateService() OVERRIDE;
-  virtual policy::UserCloudPolicyManager* GetUserCloudPolicyManager() OVERRIDE;
   virtual policy::ManagedModePolicyProvider*
       GetManagedModePolicyProvider() OVERRIDE;
   virtual policy::PolicyService* GetPolicyService() OVERRIDE;
@@ -210,8 +213,8 @@ class ProfileImpl : public Profile,
   // |prefs_| depends on |policy_service_|, which depends on
   // |user_cloud_policy_manager_| and |managed_mode_policy_provider_|.
   // TODO(bauerb, mnissler): Once |prefs_| is a ProfileKeyedService, these
-  // should become ProfileKeyedServices as well.
-  scoped_ptr<policy::UserCloudPolicyManager> cloud_policy_manager_;
+  // should become proper ProfileKeyedServices as well.
+  scoped_ptr<policy::CloudPolicyManager> cloud_policy_manager_;
   scoped_ptr<policy::ManagedModePolicyProvider> managed_mode_policy_provider_;
 #endif
   scoped_ptr<policy::PolicyService> policy_service_;