Split UserCloudPolicyManager implementation.

chrome/browser/policy/user_policy_signin_service_unittest.cc

Index: chrome/browser/policy/user_policy_signin_service_unittest.cc
diff --git a/chrome/browser/policy/user_policy_signin_service_unittest.cc b/chrome/browser/policy/user_policy_signin_service_unittest.cc
index ab7d849269d18494f6128d16a43342fb10633852..18d2729211c95b1174c5c3d5ced7e894e44eddcd 100644
--- a/chrome/browser/policy/user_policy_signin_service_unittest.cc
+++ b/chrome/browser/policy/user_policy_signin_service_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
-#include "chrome/browser/policy/mock_cloud_policy_store.h"
+#include "chrome/browser/policy/mock_user_cloud_policy_store.h"
 #include "chrome/browser/policy/user_cloud_policy_manager.h"
 #include "chrome/browser/policy/user_policy_signin_service.h"
 #include "chrome/browser/policy/user_policy_signin_service_factory.h"
@@ -50,11 +50,11 @@ class UserPolicySigninServiceTest : public testing::Test {
     static_cast<TestingBrowserProcess*>(g_browser_process)->SetLocalState(
         local_state_.get());
 
-    // Create a UserCloudPolicyManager with a MockCloudPolicyStore, and build a
-    // TestingProfile that uses it.
-    mock_store_ = new MockCloudPolicyStore();
+    // Create a UserCloudPolicyManager with a MockUserCloudPolicyStore, and
+    // build a TestingProfile that uses it.
+    mock_store_ = new MockUserCloudPolicyStore();
     scoped_ptr<UserCloudPolicyManager> manager(new UserCloudPolicyManager(
-        scoped_ptr<CloudPolicyStore>(mock_store_), false));
+        scoped_ptr<UserCloudPolicyStore>(mock_store_)));
     TestingProfile::Builder builder;
     builder.SetUserCloudPolicyManager(manager.Pass());
     profile_ = builder.Build().Pass();
@@ -85,9 +85,9 @@ class UserPolicySigninServiceTest : public testing::Test {
   }
 
   scoped_ptr<TestingProfile> profile_;
-  // Weak pointer to a MockCloudPolicyStore - lifetime is managed by the
+  // Weak pointer to a MockUserCloudPolicyStore - lifetime is managed by the
   // UserCloudPolicyManager.
-  MockCloudPolicyStore* mock_store_;
+  MockUserCloudPolicyStore* mock_store_;
 
   // BrowserPolicyConnector and UrlFetcherFactory want to initialize and free
   // various components asynchronously via tasks, so create fake threads here.