Break out base functionality of UserCloudPolicyManager.

chrome/browser/policy/user_cloud_policy_manager_unittest.cc

Index: chrome/browser/policy/user_cloud_policy_manager_unittest.cc
diff --git a/chrome/browser/policy/user_cloud_policy_manager_unittest.cc b/chrome/browser/policy/user_cloud_policy_manager_unittest.cc
index 4bed8977cbfed3a484b7c15dc3115d82620c2530..dc1f02ff3d0c0eb0b4525aaf10ffccb420442f6e 100644
--- a/chrome/browser/policy/user_cloud_policy_manager_unittest.cc
+++ b/chrome/browser/policy/user_cloud_policy_manager_unittest.cc
@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/policy/user_cloud_policy_manager.h"
+
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
-#include "chrome/browser/policy/cloud_policy_service.h"
-#include "chrome/browser/policy/configuration_policy_provider_test.h"
 #include "chrome/browser/policy/mock_cloud_policy_store.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/policy/mock_device_management_service.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
-#include "chrome/browser/policy/user_cloud_policy_manager.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "policy/policy_constants.h"
@@ -28,107 +27,6 @@ using testing::_;
 namespace policy {
 namespace {
 
-class TestHarness : public PolicyProviderTestHarness {
- public:
-  explicit TestHarness(PolicyLevel level);
-  virtual ~TestHarness();
-
-  virtual void SetUp() OVERRIDE;
-
-  virtual ConfigurationPolicyProvider* CreateProvider(
-      const PolicyDefinitionList* policy_definition_list) OVERRIDE;
-
-  virtual void InstallEmptyPolicy() OVERRIDE;
-  virtual void InstallStringPolicy(const std::string& policy_name,
-                                   const std::string& policy_value) OVERRIDE;
-  virtual void InstallIntegerPolicy(const std::string& policy_name,
-                                    int policy_value) OVERRIDE;
-  virtual void InstallBooleanPolicy(const std::string& policy_name,
-                                    bool policy_value) OVERRIDE;
-  virtual void InstallStringListPolicy(
-      const std::string& policy_name,
-      const base::ListValue* policy_value) OVERRIDE;
-  virtual void InstallDictionaryPolicy(
-      const std::string& policy_name,
-      const base::DictionaryValue* policy_value) OVERRIDE;
-
-  // Creates harnesses for mandatory and recommended levels, respectively.
-  static PolicyProviderTestHarness* CreateMandatory();
-  static PolicyProviderTestHarness* CreateRecommended();
-
- private:
-  MockCloudPolicyStore* store_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestHarness);
-};
-
-TestHarness::TestHarness(PolicyLevel level)
-    : PolicyProviderTestHarness(level, POLICY_SCOPE_USER) {}
-
-TestHarness::~TestHarness() {}
-
-void TestHarness::SetUp() {}
-
-ConfigurationPolicyProvider* TestHarness::CreateProvider(
-    const PolicyDefinitionList* policy_definition_list) {
-  // Create and initialize the store.
-  store_ = new MockCloudPolicyStore();
-  store_->NotifyStoreLoaded();
-  EXPECT_CALL(*store_, Load());
-  return new UserCloudPolicyManager(scoped_ptr<CloudPolicyStore>(store_).Pass(),
-                                    false);
-}
-
-void TestHarness::InstallEmptyPolicy() {}
-
-void TestHarness::InstallStringPolicy(const std::string& policy_name,
-                                      const std::string& policy_value) {
-  store_->policy_map_.Set(policy_name, policy_level(), policy_scope(),
-                          base::Value::CreateStringValue(policy_value));
-}
-
-void TestHarness::InstallIntegerPolicy(const std::string& policy_name,
-                                       int policy_value) {
-  store_->policy_map_.Set(policy_name, policy_level(), policy_scope(),
-                          base::Value::CreateIntegerValue(policy_value));
-}
-
-void TestHarness::InstallBooleanPolicy(const std::string& policy_name,
-                                       bool policy_value) {
-  store_->policy_map_.Set(policy_name, policy_level(), policy_scope(),
-                          base::Value::CreateBooleanValue(policy_value));
-}
-
-void TestHarness::InstallStringListPolicy(const std::string& policy_name,
-                                          const base::ListValue* policy_value) {
-  store_->policy_map_.Set(policy_name, policy_level(), policy_scope(),
-                          policy_value->DeepCopy());
-}
-
-void TestHarness::InstallDictionaryPolicy(
-    const std::string& policy_name,
-    const base::DictionaryValue* policy_value) {
-  store_->policy_map_.Set(policy_name, policy_level(), policy_scope(),
-                          policy_value->DeepCopy());
-}
-
-// static
-PolicyProviderTestHarness* TestHarness::CreateMandatory() {
-  return new TestHarness(POLICY_LEVEL_MANDATORY);
-}
-
-// static
-PolicyProviderTestHarness* TestHarness::CreateRecommended() {
-  return new TestHarness(POLICY_LEVEL_RECOMMENDED);
-}
-
-// Instantiate abstract test case for basic policy reading tests.
-INSTANTIATE_TEST_CASE_P(
-    UserCloudPolicyManagerProviderTest,
-    ConfigurationPolicyProviderTest,
-    testing::Values(TestHarness::CreateMandatory,
-                    TestHarness::CreateRecommended));
-
 class UserCloudPolicyManagerTest : public testing::Test {
  protected:
   UserCloudPolicyManagerTest()
@@ -158,9 +56,10 @@ class UserCloudPolicyManagerTest : public testing::Test {
     store_ = new MockCloudPolicyStore();
     EXPECT_CALL(*store_, Load());
     manager_.reset(
-        new UserCloudPolicyManager(scoped_ptr<CloudPolicyStore>(store_).Pass(),
+        new UserCloudPolicyManager(scoped_ptr<CloudPolicyStore>(store_),
                                    wait_for_policy_fetch));
     registrar_.Init(manager_.get(), &observer_);
+    Mock::VerifyAndClearExpectations(store_);
   }
 
   void CreateManagerWithPendingFetch() {
@@ -196,19 +95,6 @@ class UserCloudPolicyManagerTest : public testing::Test {
   DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyManagerTest);
 };
 
-TEST_F(UserCloudPolicyManagerTest, Init) {
-  CreateManager(false);
-  PolicyBundle empty_bundle;
-  EXPECT_TRUE(empty_bundle.Equals(manager_->policies()));
-  EXPECT_FALSE(manager_->IsInitializationComplete());
-
-  store_->policy_map_.CopyFrom(policy_map_);
-  EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
-  store_->NotifyStoreLoaded();
-  EXPECT_TRUE(expected_bundle_.Equals(manager_->policies()));
-  EXPECT_TRUE(manager_->IsInitializationComplete());
-}
-
 TEST_F(UserCloudPolicyManagerTest, ShutdownAndRemovePolicy) {
   // Load policy, make sure it goes away when ShutdownAndRemove() is called.
   CreateManager(false);
@@ -222,76 +108,6 @@ TEST_F(UserCloudPolicyManagerTest, ShutdownAndRemovePolicy) {
   EXPECT_FALSE(manager_->cloud_policy_service());
 }
 
-TEST_F(UserCloudPolicyManagerTest, Update) {
-  CreateManager(false);
-  EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
-  store_->NotifyStoreLoaded();
-  EXPECT_TRUE(manager_->IsInitializationComplete());
-  PolicyBundle empty_bundle;
-  EXPECT_TRUE(empty_bundle.Equals(manager_->policies()));
-
-  store_->policy_map_.CopyFrom(policy_map_);
-  EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
-  store_->NotifyStoreLoaded();
-  EXPECT_TRUE(expected_bundle_.Equals(manager_->policies()));
-  EXPECT_TRUE(manager_->IsInitializationComplete());
-}
-
-TEST_F(UserCloudPolicyManagerTest, RefreshNotRegistered) {
-  CreateManager(false);
-  manager_->Initialize(&prefs_, &device_management_service_,
-                       USER_AFFILIATION_NONE);
-
-  EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
-  store_->NotifyStoreLoaded();
-  Mock::VerifyAndClearExpectations(&observer_);
-
-  // A refresh on a non-registered store should not block.
-  EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
-  manager_->RefreshPolicies();
-  Mock::VerifyAndClearExpectations(&observer_);
-}
-
-TEST_F(UserCloudPolicyManagerTest, RefreshSuccessful) {
-  CreateManager(false);
-  manager_->Initialize(&prefs_, &device_management_service_,
-                       USER_AFFILIATION_NONE);
-  manager_->cloud_policy_service()->client()->SetupRegistration("dm_token",
-                                                                "client_id");
-
-  EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
-  store_->NotifyStoreLoaded();
-  Mock::VerifyAndClearExpectations(&observer_);
-
-  // Start a refresh.
-  EXPECT_CALL(observer_, OnUpdatePolicy(_)).Times(0);
-  MockDeviceManagementJob* request_job;
-  EXPECT_CALL(device_management_service_,
-              CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH))
-      .WillOnce(device_management_service_.CreateAsyncJob(&request_job));
-  manager_->RefreshPolicies();
-  ASSERT_TRUE(request_job);
-  store_->policy_map_.CopyFrom(policy_map_);
-  Mock::VerifyAndClearExpectations(&observer_);
-
-  // A stray reload should be suppressed until the refresh completes.
-  EXPECT_CALL(observer_, OnUpdatePolicy(_)).Times(0);
-  store_->NotifyStoreLoaded();
-  Mock::VerifyAndClearExpectations(&observer_);
-
-  // Respond to the policy fetch, which should trigger a write to |store_|.
-  EXPECT_CALL(observer_, OnUpdatePolicy(_)).Times(0);
-  EXPECT_CALL(*store_, Store(_));
-  request_job->SendResponse(DM_STATUS_SUCCESS, policy_blob_);
-  Mock::VerifyAndClearExpectations(&observer_);
-
-  // The load notification from |store_| should trigger the policy update.
-  EXPECT_CALL(observer_, OnUpdatePolicy(manager_.get()));
-  store_->NotifyStoreLoaded();
-  EXPECT_TRUE(expected_bundle_.Equals(manager_->policies()));
-  Mock::VerifyAndClearExpectations(&observer_);
-}
-
 TEST_F(UserCloudPolicyManagerTest, WaitForPolicyFetch) {
   CreateManagerWithPendingFetch();
 
@@ -301,8 +117,7 @@ TEST_F(UserCloudPolicyManagerTest, WaitForPolicyFetch) {
   EXPECT_CALL(device_management_service_,
               CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH))
       .WillOnce(device_management_service_.CreateAsyncJob(&fetch_request));
-  manager_->cloud_policy_service()->client()->SetupRegistration("dm_token",
-                                                                "client_id");
+  manager_->cloud_policy_client()->SetupRegistration("dm_token", "client_id");
   ASSERT_TRUE(fetch_request);
   EXPECT_FALSE(manager_->IsInitializationComplete());
   Mock::VerifyAndClearExpectations(&observer_);
@@ -331,8 +146,7 @@ TEST_F(UserCloudPolicyManagerTest, WaitForPolicyFetchError) {
   EXPECT_CALL(device_management_service_,
               CreateJob(DeviceManagementRequestJob::TYPE_POLICY_FETCH))
       .WillOnce(device_management_service_.CreateAsyncJob(&fetch_request));
-  manager_->cloud_policy_service()->client()->SetupRegistration("dm_token",
-                                                                "client_id");
+  manager_->cloud_policy_client()->SetupRegistration("dm_token", "client_id");
   ASSERT_TRUE(fetch_request);
   EXPECT_FALSE(manager_->IsInitializationComplete());
   Mock::VerifyAndClearExpectations(&observer_);