Update from https://crrev.com/306655

base/prefs/pref_registry.cc

Index: base/prefs/pref_registry.cc
diff --git a/base/prefs/pref_registry.cc b/base/prefs/pref_registry.cc
index 134996185c4dd593709a8085b701d8ce10020d10..69f0494f534408807fb916400e2abe45b4cc0107 100644
--- a/base/prefs/pref_registry.cc
+++ b/base/prefs/pref_registry.cc
@@ -28,7 +28,7 @@ PrefRegistry::const_iterator PrefRegistry::end() const {
   return defaults_->end();
 }
 
-void PrefRegistry::SetDefaultPrefValue(const char* pref_name,
+void PrefRegistry::SetDefaultPrefValue(const std::string& pref_name,
                                        base::Value* value) {
   DCHECK(value);
   const base::Value* current_value = NULL;
@@ -40,7 +40,7 @@ void PrefRegistry::SetDefaultPrefValue(const char* pref_name,
   defaults_->ReplaceDefaultValue(pref_name, make_scoped_ptr(value));
 }
 
-void PrefRegistry::RegisterPreference(const char* path,
+void PrefRegistry::RegisterPreference(const std::string& path,
                                       base::Value* default_value) {
   base::Value::Type orig_type = default_value->GetType();
   DCHECK(orig_type != base::Value::TYPE_NULL &&