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

chrome/browser/policy/device_policy_cache.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/task.h"
@@ skipping 251 matching lines @@
     return;
   }
   signed_settings_helper_->StartRetrievePolicyOp(this);
 }
 
 // static
 void DevicePolicyCache::DecodeDevicePolicy(
     const em::ChromeDeviceSettingsProto& policy,
     PolicyMap* mandatory,
     PolicyMap* recommended) {
-  if (policy.has_policy_refresh_rate()) {
+  if (policy.has_device_policy_refresh_rate()) {
     const em::DevicePolicyRefreshRateProto container =
-        policy.policy_refresh_rate();
-    if (container.has_policy_refresh_rate()) {
-      mandatory->Set(kPolicyPolicyRefreshRate,
-                     DecodeIntegerValue(container.policy_refresh_rate()));
+        policy.device_policy_refresh_rate();
+    if (container.has_device_policy_refresh_rate()) {
+      mandatory->Set(kPolicyDevicePolicyRefreshRate,
+                     DecodeIntegerValue(
+                         container.device_policy_refresh_rate()));
     }
   }
 
   if (policy.has_device_proxy_settings()) {
     const em::DeviceProxySettingsProto container =
         policy.device_proxy_settings();
     if (container.has_proxy_mode()) {
       recommended->Set(kPolicyProxyMode,
                        Value::CreateStringValue(container.proxy_mode()));
     }
     if (container.has_proxy_server()) {
       recommended->Set(kPolicyProxyServer,
                        Value::CreateStringValue(container.proxy_server()));
     }
     if (container.has_proxy_pac_url()) {
       recommended->Set(kPolicyProxyPacUrl,
                        Value::CreateStringValue(container.proxy_pac_url()));
     }
     if (container.has_proxy_bypass_list()) {
       recommended->Set(kPolicyProxyBypassList,
                        Value::CreateStringValue(container.proxy_bypass_list()));
     }
   }
 }
 
 }  // namespace policy