Device policy infrastructure

chrome/browser/policy/cloud_policy_cache_unittest.cc

Index: chrome/browser/policy/cloud_policy_cache_unittest.cc
diff --git a/chrome/browser/policy/cloud_policy_cache_unittest.cc b/chrome/browser/policy/cloud_policy_cache_unittest.cc
index 38acb3429ae6b3d73f07134c239de1b483aada16..630ef350f347c9b276672ffd787f882047a58eef 100644
--- a/chrome/browser/policy/cloud_policy_cache_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_cache_unittest.cc
@@ -82,6 +82,14 @@ class CloudPolicyCacheTest : public testing::Test {
     return temp_dir_.path().AppendASCII("CloudPolicyCacheTest");
   }
 
+  const PolicyMapType& mandatory_policy(const CloudPolicyCache& cache) {
+    return cache.mandatory_policy_;
+  }
+
+  const PolicyMapType& recommended_policy(const CloudPolicyCache& cache) {
+    return cache.recommended_policy_;
+  }
+
   bool Equals(const PolicyMapType& a, const PolicyMapType& b) const {
     return CloudPolicyCache::Equals(a, b);
   }
@@ -182,16 +190,16 @@ TEST_F(CloudPolicyCacheTest, DecodeStringList) {
 TEST_F(CloudPolicyCacheTest, Empty) {
   CloudPolicyCache cache(test_file());
   PolicyMapType empty;
-  EXPECT_TRUE(Equals(empty, *cache.GetMandatoryPolicy()));
-  EXPECT_TRUE(Equals(empty, *cache.GetRecommendedPolicy()));
+  EXPECT_TRUE(Equals(empty, mandatory_policy(cache)));
+  EXPECT_TRUE(Equals(empty, recommended_policy(cache)));
   EXPECT_EQ(base::Time(), cache.last_policy_refresh_time());
 }
 
 TEST_F(CloudPolicyCacheTest, LoadNoFile) {
   CloudPolicyCache cache(test_file());
-  cache.LoadPolicyFromFile();
+  cache.LoadFromFile();
   PolicyMapType empty;
-  EXPECT_TRUE(Equals(empty, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(empty, mandatory_policy(cache)));
   EXPECT_EQ(base::Time(), cache.last_policy_refresh_time());
 }
 
@@ -202,9 +210,9 @@ TEST_F(CloudPolicyCacheTest, RejectFuture) {
                            em::PolicyOptions::MANDATORY));
   WritePolicy(*policy_response);
   CloudPolicyCache cache(test_file());
-  cache.LoadPolicyFromFile();
+  cache.LoadFromFile();
   PolicyMapType empty;
-  EXPECT_TRUE(Equals(empty, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(empty, mandatory_policy(cache)));
   EXPECT_EQ(base::Time(), cache.last_policy_refresh_time());
 }
 
@@ -214,9 +222,9 @@ TEST_F(CloudPolicyCacheTest, LoadWithFile) {
                            em::PolicyOptions::MANDATORY));
   WritePolicy(*policy_response);
   CloudPolicyCache cache(test_file());
-  cache.LoadPolicyFromFile();
+  cache.LoadFromFile();
   PolicyMapType empty;
-  EXPECT_TRUE(Equals(empty, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(empty, mandatory_policy(cache)));
   EXPECT_NE(base::Time(), cache.last_policy_refresh_time());
   EXPECT_GE(base::Time::Now(), cache.last_policy_refresh_time());
 }
@@ -228,12 +236,12 @@ TEST_F(CloudPolicyCacheTest, LoadWithData) {
                            em::PolicyOptions::MANDATORY));
   WritePolicy(*policy);
   CloudPolicyCache cache(test_file());
-  cache.LoadPolicyFromFile();
+  cache.LoadFromFile();
   PolicyMapType expected;
   expected.insert(
       std::make_pair(kPolicyHomepageLocation,
                      Value::CreateStringValue("http://www.example.com")));
-  EXPECT_TRUE(Equals(expected, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(expected, mandatory_policy(cache)));
 }
 
 TEST_F(CloudPolicyCacheTest, SetPolicy) {
@@ -253,14 +261,14 @@ TEST_F(CloudPolicyCacheTest, SetPolicy) {
       std::make_pair(kPolicyHomepageLocation,
                      Value::CreateStringValue("http://www.example.com")));
   PolicyMapType empty;
-  EXPECT_TRUE(Equals(expected, *cache.GetMandatoryPolicy()));
-  EXPECT_TRUE(Equals(empty, *cache.GetRecommendedPolicy()));
+  EXPECT_TRUE(Equals(expected, mandatory_policy(cache)));
+  EXPECT_TRUE(Equals(empty, recommended_policy(cache)));
   policy.reset(CreateHomepagePolicy("http://www.example.com",
                                     base::Time::NowFromSystemTime(),
                                     em::PolicyOptions::RECOMMENDED));
   EXPECT_TRUE(cache.SetPolicy(*policy));
-  EXPECT_TRUE(Equals(expected, *cache.GetRecommendedPolicy()));
-  EXPECT_TRUE(Equals(empty, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(expected, recommended_policy(cache)));
+  EXPECT_TRUE(Equals(empty, mandatory_policy(cache)));
 }
 
 TEST_F(CloudPolicyCacheTest, ResetPolicy) {
@@ -275,14 +283,14 @@ TEST_F(CloudPolicyCacheTest, ResetPolicy) {
   expected.insert(
       std::make_pair(kPolicyHomepageLocation,
                      Value::CreateStringValue("http://www.example.com")));
-  EXPECT_TRUE(Equals(expected, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(expected, mandatory_policy(cache)));
 
   scoped_ptr<em::CloudPolicyResponse> empty_policy(
       CreateHomepagePolicy("", base::Time::NowFromSystemTime(),
                            em::PolicyOptions::MANDATORY));
   EXPECT_TRUE(cache.SetPolicy(*empty_policy));
   PolicyMapType empty;
-  EXPECT_TRUE(Equals(empty, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(empty, mandatory_policy(cache)));
 }
 
 TEST_F(CloudPolicyCacheTest, PersistPolicy) {
@@ -299,12 +307,12 @@ TEST_F(CloudPolicyCacheTest, PersistPolicy) {
 
   EXPECT_TRUE(file_util::PathExists(test_file()));
   CloudPolicyCache cache(test_file());
-  cache.LoadPolicyFromFile();
+  cache.LoadFromFile();
   PolicyMapType expected;
   expected.insert(
       std::make_pair(kPolicyHomepageLocation,
                      Value::CreateStringValue("http://www.example.com")));
-  EXPECT_TRUE(Equals(expected, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(expected, mandatory_policy(cache)));
 }
 
 TEST_F(CloudPolicyCacheTest, FreshPolicyOverride) {
@@ -321,12 +329,12 @@ TEST_F(CloudPolicyCacheTest, FreshPolicyOverride) {
                            em::PolicyOptions::MANDATORY));
   EXPECT_TRUE(cache.SetPolicy(*updated_policy));
 
-  cache.LoadPolicyFromFile();
+  cache.LoadFromFile();
   PolicyMapType expected;
   expected.insert(
       std::make_pair(kPolicyHomepageLocation,
                      Value::CreateStringValue("http://www.chromium.org")));
-  EXPECT_TRUE(Equals(expected, *cache.GetMandatoryPolicy()));
+  EXPECT_TRUE(Equals(expected, mandatory_policy(cache)));
 }
 
 }  // namespace policy