Split the policy refresh rate preference into user- and device-policy refresh rate.

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/enterprise_install_attributes.h"
 #include "policy/configuration_policy_type.h"
@@ skipping 46 matching lines @@
   arg0->OnRetrievePolicyCompleted(status_code, policy);
 }
 
 void CreateRefreshRatePolicy(em::PolicyFetchResponse* policy,
                              const std::string& user,
                              int refresh_rate) {
   // This method omits a few fields which currently aren't needed by tests:
   // timestamp, machine_name, policy_type, public key info.
   em::PolicyData signed_response;
   em::ChromeDeviceSettingsProto settings;
-  settings.mutable_policy_refresh_rate()->set_policy_refresh_rate(refresh_rate);
+  settings.mutable_device_policy_refresh_rate()->
+      set_device_policy_refresh_rate(refresh_rate);
   signed_response.set_username(user);
   signed_response.set_request_token("dmtoken");
   signed_response.set_device_id("deviceid");
   EXPECT_TRUE(
       settings.SerializeToString(signed_response.mutable_policy_value()));
   std::string serialized_signed_response;
   EXPECT_TRUE(signed_response.SerializeToString(&serialized_signed_response));
   policy->set_policy_data(serialized_signed_response);
 }
 
@@ skipping 66 matching lines @@
 TEST_F(DevicePolicyCacheTest, Startup) {
   em::PolicyFetchResponse policy;
   CreateRefreshRatePolicy(&policy, kTestUser, 120);
   EXPECT_CALL(signed_settings_helper_, StartRetrievePolicyOp(_)).WillOnce(
       MockSignedSettingsHelperRetrievePolicy(SignedSettings::SUCCESS,
                                              policy));
   cache_->Load();
   testing::Mock::VerifyAndClearExpectations(&signed_settings_helper_);
   FundamentalValue expected(120);
   EXPECT_TRUE(Value::Equals(&expected,
-                            GetMandatoryPolicy(kPolicyPolicyRefreshRate)));
+                            GetMandatoryPolicy(
+                                kPolicyDevicePolicyRefreshRate)));
 }
 
 TEST_F(DevicePolicyCacheTest, SetPolicy) {
   InSequence s;
 
   MakeEnterpriseDevice(kTestUser);
 
   // Startup.
   em::PolicyFetchResponse policy;
   CreateRefreshRatePolicy(&policy, kTestUser, 120);
   EXPECT_CALL(signed_settings_helper_, StartRetrievePolicyOp(_)).WillOnce(
       MockSignedSettingsHelperRetrievePolicy(SignedSettings::SUCCESS,
                                              policy));
   cache_->Load();
   testing::Mock::VerifyAndClearExpectations(&signed_settings_helper_);
   FundamentalValue expected(120);
   EXPECT_TRUE(Value::Equals(&expected,
-                            GetMandatoryPolicy(kPolicyPolicyRefreshRate)));
+                            GetMandatoryPolicy(
+                                kPolicyDevicePolicyRefreshRate)));
 
   // Set new policy information.
   em::PolicyFetchResponse new_policy;
   CreateRefreshRatePolicy(&new_policy, kTestUser, 300);
   EXPECT_CALL(signed_settings_helper_, StartStorePolicyOp(_, _)).WillOnce(
       MockSignedSettingsHelperStorePolicy(chromeos::SignedSettings::SUCCESS));
   EXPECT_CALL(signed_settings_helper_, StartRetrievePolicyOp(_)).WillOnce(
       MockSignedSettingsHelperRetrievePolicy(SignedSettings::SUCCESS,
                                              new_policy));
   cache_->SetPolicy(new_policy);
   testing::Mock::VerifyAndClearExpectations(&signed_settings_helper_);
   FundamentalValue updated_expected(300);
   EXPECT_TRUE(Value::Equals(&updated_expected,
-                            GetMandatoryPolicy(kPolicyPolicyRefreshRate)));
+                            GetMandatoryPolicy(
+                                kPolicyDevicePolicyRefreshRate)));
 }
 
 TEST_F(DevicePolicyCacheTest, SetPolicyWrongUser) {
   InSequence s;
 
   MakeEnterpriseDevice(kTestUser);
 
   // Startup.
   em::PolicyFetchResponse policy;
   CreateRefreshRatePolicy(&policy, kTestUser, 120);
   EXPECT_CALL(signed_settings_helper_, StartRetrievePolicyOp(_)).WillOnce(
       MockSignedSettingsHelperRetrievePolicy(SignedSettings::SUCCESS,
                                              policy));
   cache_->Load();
   testing::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@example.com", 300);
   EXPECT_CALL(signed_settings_helper_, StartStorePolicyOp(_, _)).Times(0);
   cache_->SetPolicy(new_policy);
   testing::Mock::VerifyAndClearExpectations(&signed_settings_helper_);
 
   FundamentalValue expected(120);
   EXPECT_TRUE(Value::Equals(&expected,
-                            GetMandatoryPolicy(kPolicyPolicyRefreshRate)));
+                            GetMandatoryPolicy(
+                                kPolicyDevicePolicyRefreshRate)));
 }
 
 TEST_F(DevicePolicyCacheTest, SetPolicyNonEnterpriseDevice) {
   InSequence s;
 
   // Startup.
   em::PolicyFetchResponse policy;
   CreateRefreshRatePolicy(&policy, kTestUser, 120);
   EXPECT_CALL(signed_settings_helper_, StartRetrievePolicyOp(_)).WillOnce(
       MockSignedSettingsHelperRetrievePolicy(SignedSettings::SUCCESS,
                                              policy));
   cache_->Load();
   testing::Mock::VerifyAndClearExpectations(&signed_settings_helper_);
 
   // Set new policy information. This should fail due to invalid user.
   em::PolicyFetchResponse new_policy;
   CreateRefreshRatePolicy(&new_policy, kTestUser, 120);
   EXPECT_CALL(signed_settings_helper_, StartStorePolicyOp(_, _)).Times(0);
   cache_->SetPolicy(new_policy);
   testing::Mock::VerifyAndClearExpectations(&signed_settings_helper_);
 
   FundamentalValue expected(120);
   EXPECT_TRUE(Value::Equals(&expected,
-                            GetMandatoryPolicy(kPolicyPolicyRefreshRate)));
+                            GetMandatoryPolicy(
+                                kPolicyDevicePolicyRefreshRate)));
 }
 
 TEST_F(DevicePolicyCacheTest, SetProxyPolicy) {
   InSequence s;
 
   MakeEnterpriseDevice(kTestUser);
 
   // Startup.
   em::PolicyFetchResponse policy;
   CreateProxyPolicy(&policy, kTestUser, "direct", "http://proxy:8080",
@@ skipping 11 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