Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/device_policy_cache_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/policy/device_policy_cache.h"
 
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
-#include "chrome/browser/policy/device_policy_identity_strategy.h"
+#include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
 #include "policy/configuration_policy_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace policy {
 
 namespace {
 
 // Test registration user name.
@@ skipping 83 matching lines @@
 
 }  // namespace
 
 class DevicePolicyCacheTest : public testing::Test {
  protected:
   DevicePolicyCacheTest()
       : cryptohome_(chromeos::CryptohomeLibrary::GetImpl(true)),
         install_attributes_(cryptohome_.get()) {}
 
   virtual void SetUp() {
-    cache_.reset(new DevicePolicyCache(&identity_strategy_,
+    data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
+    cache_.reset(new DevicePolicyCache(data_store_.get(),
                                        &install_attributes_,
                                        &signed_settings_helper_));
   }
 
   virtual void TearDown() {
     EXPECT_CALL(signed_settings_helper_, CancelCallback(_));
     cache_.reset();
   }
 
   void MakeEnterpriseDevice(const char* registration_user) {
     ASSERT_EQ(EnterpriseInstallAttributes::LOCK_SUCCESS,
               install_attributes_.LockDevice(registration_user));
   }
 
   const Value* GetMandatoryPolicy(ConfigurationPolicyType policy) {
     return cache_->mandatory_policy_.Get(policy);
   }
 
   const Value* GetRecommendedPolicy(ConfigurationPolicyType policy) {
     return cache_->recommended_policy_.Get(policy);
   }
 
   scoped_ptr<chromeos::CryptohomeLibrary> cryptohome_;
   EnterpriseInstallAttributes install_attributes_;
-  DevicePolicyIdentityStrategy identity_strategy_;
+  scoped_ptr<CloudPolicyDataStore> data_store_;
   MockSignedSettingsHelper signed_settings_helper_;
   scoped_ptr<DevicePolicyCache> cache_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DevicePolicyCacheTest);
 };
 
 TEST_F(DevicePolicyCacheTest, Startup) {
   em::PolicyFetchResponse policy;
   CreateRefreshRatePolicy(&policy, kTestUser, 120);
@@ skipping 116 matching lines @@
                             GetRecommendedPolicy(kPolicyProxyMode)));
   EXPECT_TRUE(Value::Equals(&expected_proxy_server,
                             GetRecommendedPolicy(kPolicyProxyServer)));
   EXPECT_TRUE(Value::Equals(&expected_proxy_pac_url,
                             GetRecommendedPolicy(kPolicyProxyPacUrl)));
   EXPECT_TRUE(Value::Equals(&expected_proxy_bypass_list,
                             GetRecommendedPolicy(kPolicyProxyBypassList)));
 }
 
 }  // namespace policy