Allow re-enrollment to the same domain in case of policy data loss.

chrome/browser/policy/device_policy_cache_unittest.cc

Index: chrome/browser/policy/device_policy_cache_unittest.cc
diff --git a/chrome/browser/policy/device_policy_cache_unittest.cc b/chrome/browser/policy/device_policy_cache_unittest.cc
index 42105ca8fc742d2e0031e2972d4a770b0c40a763..c3dcba49dcff148a6bdd8b5b6f419dfd32ca363c 100644
--- a/chrome/browser/policy/device_policy_cache_unittest.cc
+++ b/chrome/browser/policy/device_policy_cache_unittest.cc
@@ -192,7 +192,7 @@ TEST_F(DevicePolicyCacheTest, SetPolicy) {
   cache_->RemoveObserver(&observer_);
 }
 
-TEST_F(DevicePolicyCacheTest, SetPolicyWrongUser) {
+TEST_F(DevicePolicyCacheTest, SetPolicyOtherUserSameDomain) {
   InSequence s;
 
   MakeEnterpriseDevice(kTestUser);
@@ -207,9 +207,37 @@ TEST_F(DevicePolicyCacheTest, SetPolicyWrongUser) {
   cache_->Load();
   Mock::VerifyAndClearExpectations(&signed_settings_helper_);
 
-  // Set new policy information. This should fail due to invalid user.
+  // Set new policy information. This should succeed as the domain is the same.
+  em::PolicyFetchResponse new_policy;
+  CreateRefreshRatePolicy(&new_policy, "another_user@example.com", 300);
+  EXPECT_CALL(signed_settings_helper_, StartStorePolicyOp(_, _)).Times(1);
+  EXPECT_TRUE(cache_->SetPolicy(new_policy));
+  Mock::VerifyAndClearExpectations(&signed_settings_helper_);
+
+  base::FundamentalValue expected(120);

[Mattias Nissler (ping if slow), 2012/06/18 16:45:17]

This check is weird. You don't propagate the new policy into the cache (but it
will eventually) and still test for the old value here.

[pastarmovj, 2012/06/18 17:12:58]

Sorry this piece is a junk leftover when i copied stuff from the previous unit
test. I am only interested in the StartStorePolicyOp invocation. The previous
test already makes sure that whatever we store is coming out fine on the
retrieve end as well.

+  EXPECT_TRUE(Value::Equals(&expected,
+                            GetPolicy(key::kDevicePolicyRefreshRate)));
+}
+
+TEST_F(DevicePolicyCacheTest, SetPolicyOtherUserOtherDomain) {
+  InSequence s;
+
+  MakeEnterpriseDevice(kTestUser);
+
+  // Startup.
+  em::PolicyFetchResponse policy;
+  CreateRefreshRatePolicy(&policy, kTestUser, 120);
+  EXPECT_CALL(signed_settings_helper_, StartRetrievePolicyOp(_)).WillOnce(
+      MockSignedSettingsHelperRetrievePolicy(SignedSettings::SUCCESS,
+                                             policy));
+  EXPECT_CALL(observer_, OnCacheUpdate(cache_.get()));
+  cache_->Load();
+  Mock::VerifyAndClearExpectations(&signed_settings_helper_);
+
+  // Set new policy information. This should fail because the user is from
+  // different domain.
   em::PolicyFetchResponse new_policy;
-  CreateRefreshRatePolicy(&new_policy, "foreign_user@example.com", 300);
+  CreateRefreshRatePolicy(&new_policy, "foreign_user@hackers.com", 300);
   EXPECT_CALL(signed_settings_helper_, StartStorePolicyOp(_, _)).Times(0);
   EXPECT_FALSE(cache_->SetPolicy(new_policy));
   Mock::VerifyAndClearExpectations(&signed_settings_helper_);