Split UserCloudPolicyManager implementation.

chrome/test/base/testing_profile.cc

Index: chrome/test/base/testing_profile.cc
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 6a28c65fe78c7ead873ac897900a16fe8fff5885..4ca2d42d9d40b1095b5b08d182a88b85752de468 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -208,15 +208,13 @@ TestingProfile::TestingProfile(
     const FilePath& path,
     Delegate* delegate,
     scoped_refptr<ExtensionSpecialStoragePolicy> extension_policy,
-    scoped_ptr<PrefService> prefs,
-    scoped_ptr<policy::UserCloudPolicyManager> user_cloud_policy_manager)
+    scoped_ptr<PrefService> prefs)
     : start_time_(Time::Now()),
       prefs_(prefs.release()),
       testing_prefs_(NULL),
       incognito_(false),
       last_session_exited_cleanly_(true),
       extension_special_storage_policy_(extension_policy),
-      user_cloud_policy_manager_(user_cloud_policy_manager.release()),
       profile_path_(path),
       profile_dependency_manager_(ProfileDependencyManager::GetInstance()),
       delegate_(delegate) {
@@ -304,11 +302,6 @@ TestingProfile::~TestingProfile() {
 
   DestroyTopSites();
 
-#if defined(ENABLE_CONFIGURATION_POLICY)
-  if (user_cloud_policy_manager_)
-    user_cloud_policy_manager_->Shutdown();
-#endif
-
   if (pref_proxy_config_tracker_.get())
     pref_proxy_config_tracker_->DetachFromPrefService();
 }
@@ -545,10 +538,6 @@ net::CookieMonster* TestingProfile::GetCookieMonster() {
       GetCookieMonster();
 }
 
-policy::UserCloudPolicyManager* TestingProfile::GetUserCloudPolicyManager() {
-  return user_cloud_policy_manager_.get();
-}
-
 policy::ManagedModePolicyProvider*
 TestingProfile::GetManagedModePolicyProvider() {
   return NULL;
@@ -816,11 +805,6 @@ void TestingProfile::Builder::SetPrefService(scoped_ptr<PrefService> prefs) {
   pref_service_ = prefs.Pass();
 }
 
-void TestingProfile::Builder::SetUserCloudPolicyManager(
-    scoped_ptr<policy::UserCloudPolicyManager> manager) {
-  user_cloud_policy_manager_ = manager.Pass();
-}
-
 scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
   DCHECK(!build_called_);
   build_called_ = true;
@@ -828,6 +812,5 @@ scoped_ptr<TestingProfile> TestingProfile::Builder::Build() {
       path_,
       delegate_,
       extension_policy_,
-      pref_service_.Pass(),
-      user_cloud_policy_manager_.Pass()));
+      pref_service_.Pass()));
 }