Update from https://crrev.com/309415

base/prefs/pref_service.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 "base/prefs/pref_service.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 222 matching lines @@
     default:
       return INITIALIZATION_STATUS_ERROR;
   }
 }
 
 bool PrefService::IsManagedPreference(const std::string& pref_name) const {
   const Preference* pref = FindPreference(pref_name);
   return pref && pref->IsManaged();
 }
 
+bool PrefService::IsPreferenceManagedByCustodian(
+    const std::string& pref_name) const {
+  const Preference* pref = FindPreference(pref_name);
+  return pref && pref->IsManagedByCustodian();
+}
+
 bool PrefService::IsUserModifiablePreference(
     const std::string& pref_name) const {
   const Preference* pref = FindPreference(pref_name);
   return pref && pref->IsUserModifiable();
 }
 
 const base::DictionaryValue* PrefService::GetDictionary(
     const std::string& path) const {
   DCHECK(CalledOnValidThread());
 
@@ skipping 257 matching lines @@
   }
 
   // The pref has no recommended value.
   return NULL;
 }
 
 bool PrefService::Preference::IsManaged() const {
   return pref_value_store()->PrefValueInManagedStore(name_);
 }
 
+bool PrefService::Preference::IsManagedByCustodian() const {
+  return pref_value_store()->PrefValueInSupervisedStore(name_.c_str());
+}
+
 bool PrefService::Preference::IsRecommended() const {
   return pref_value_store()->PrefValueFromRecommendedStore(name_);
 }
 
 bool PrefService::Preference::HasExtensionSetting() const {
   return pref_value_store()->PrefValueInExtensionStore(name_);
 }
 
 bool PrefService::Preference::HasUserSetting() const {
   return pref_value_store()->PrefValueInUserStore(name_);
@@ skipping 30 matching lines @@
       DCHECK(found_value->IsType(default_type));
       return found_value;
     } else {
       // Every registered preference has at least a default value.
       NOTREACHED() << "no valid value found for registered pref " << path;
     }
   }
 
   return NULL;
 }