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

chrome/browser/policy/device_policy_cache_unittest.cc

 // Copyright (c) 2012 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/chromeos/login/mock_signed_settings_helper.h"
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
@@ skipping 174 matching lines @@
   EXPECT_CALL(observer_, OnCacheUpdate(cache_.get()));
   retrieve_callback.Run(chromeos::SignedSettings::SUCCESS, new_policy);
   base::FundamentalValue updated_expected(300);
   EXPECT_TRUE(Value::Equals(&updated_expected,
                             GetPolicy(key::kDevicePolicyRefreshRate)));
   Mock::VerifyAndClearExpectations(&observer_);
 
   cache_->RemoveObserver(&observer_);
 }
 
-TEST_F(DevicePolicyCacheTest, SetPolicyWrongUser) {
+TEST_F(DevicePolicyCacheTest, SetPolicyOtherUserSameDomain) {
   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 due to invalid user.

[Mattias Nissler (ping if slow), 2012/06/04 10:17:52]

comment is outdated.

[pastarmovj, 2012/06/08 09:54:32]

Done.

   em::PolicyFetchResponse new_policy;
-  CreateRefreshRatePolicy(&new_policy, "foreign_user@example.com", 300);
+  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);
+  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 due to invalid user.
+  em::PolicyFetchResponse new_policy;
+  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_);
 
   base::FundamentalValue expected(120);
   EXPECT_TRUE(Value::Equals(&expected,
                             GetPolicy(key::kDevicePolicyRefreshRate)));
 }
 
 TEST_F(DevicePolicyCacheTest, SetPolicyNonEnterpriseDevice) {
@@ skipping 59 matching lines @@
   EXPECT_CALL(observer_, OnCacheUpdate(cache_.get()));
   cache_->Load();
   Mock::VerifyAndClearExpectations(&signed_settings_helper_);
   StringValue expected_config(fake_config);
   EXPECT_TRUE(
       Value::Equals(&expected_config,
                     GetPolicy(key::kDeviceOpenNetworkConfiguration)));
 }
 
 }  // namespace policy