Create additional PrefStore for Device Management policy.

chrome/browser/prefs/pref_service.cc

 // Copyright (c) 2010 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/prefs/pref_service.h"
 
 #include <algorithm>
 #include <string>
 
 #include "app/l10n_util.h"
@@ skipping 584 matching lines @@
   Value* found_value = NULL;
   if (pref_service_->pref_value_store_->GetValue(name_, &found_value))
     return found_value;
 
   // Every registered preference has at least a default value.
   NOTREACHED() << "no valid value found for registered pref " << name_;
   return NULL;
 }
 
 bool PrefService::Preference::IsManaged() const {
-  return pref_service_->pref_value_store_->
-      PrefValueInManagedStore(name_.c_str());
+  PrefValueStore* pref_value_store =
+      pref_service_->pref_value_store_;
+  return pref_value_store->PrefValueInManagedPlatformStore(name_.c_str()) ||
+      pref_value_store->PrefValueInDeviceManagementStore(name_.c_str());
 }
 
 bool PrefService::Preference::HasExtensionSetting() const {
   return pref_service_->pref_value_store_->
       PrefValueInExtensionStore(name_.c_str());
 }
 
 bool PrefService::Preference::HasUserSetting() const {
   return pref_service_->pref_value_store_->
       PrefValueInUserStore(name_.c_str());
@@ skipping 11 matching lines @@
 
 bool PrefService::Preference::IsDefaultValue() const {
   return pref_service_->pref_value_store_->
       PrefValueFromDefaultStore(name_.c_str());
 }
 
 bool PrefService::Preference::IsUserModifiable() const {
   return pref_service_->pref_value_store_->
       PrefValueUserModifiable(name_.c_str());
 }