Index: chrome/browser/extensions/api/preference/preference_api.cc |
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc |
index 25008a671babf7d876ca14d265462c6c9cc44272..8c1422bcc1062f79c4c007d93d00f1e0c32b2f49 100644 |
--- a/chrome/browser/extensions/api/preference/preference_api.cc |
+++ b/chrome/browser/extensions/api/preference/preference_api.cc |
@@ -383,7 +383,7 @@ void PreferenceEventRouter::OnPrefChanged(PrefService* pref_service, |
base::ListValue args; |
const PrefService::Preference* pref = |
- pref_service->FindPreference(browser_pref.c_str()); |
+ pref_service->FindPreference(browser_pref); |
CHECK(pref); |
PrefTransformerInterface* transformer = |
PrefMapping::GetInstance()->FindTransformerForBrowserPref(browser_pref); |
@@ -427,7 +427,7 @@ void PreferenceAPIBase::SetExtensionControlledPref( |
base::Value* value) { |
#ifndef NDEBUG |
const PrefService::Preference* pref = |
- extension_prefs()->pref_service()->FindPreference(pref_key.c_str()); |
+ extension_prefs()->pref_service()->FindPreference(pref_key); |
DCHECK(pref) << "Extension controlled preference key " << pref_key |
<< " not registered."; |
DCHECK_EQ(pref->GetType(), value->GetType()) |
@@ -455,7 +455,7 @@ void PreferenceAPIBase::RemoveExtensionControlledPref( |
const std::string& extension_id, |
const std::string& pref_key, |
ExtensionPrefsScope scope) { |
- DCHECK(extension_prefs()->pref_service()->FindPreference(pref_key.c_str())) |
+ DCHECK(extension_prefs()->pref_service()->FindPreference(pref_key)) |
<< "Extension controlled preference key " << pref_key |
<< " not registered."; |
@@ -476,7 +476,7 @@ bool PreferenceAPIBase::CanExtensionControlPref( |
const std::string& extension_id, |
const std::string& pref_key, |
bool incognito) { |
- DCHECK(extension_prefs()->pref_service()->FindPreference(pref_key.c_str())) |
+ DCHECK(extension_prefs()->pref_service()->FindPreference(pref_key)) |
<< "Extension controlled preference key " << pref_key |
<< " not registered."; |
@@ -488,7 +488,7 @@ bool PreferenceAPIBase::DoesExtensionControlPref( |
const std::string& extension_id, |
const std::string& pref_key, |
bool* from_incognito) { |
- DCHECK(extension_prefs()->pref_service()->FindPreference(pref_key.c_str())) |
+ DCHECK(extension_prefs()->pref_service()->FindPreference(pref_key)) |
<< "Extension controlled preference key " << pref_key |
<< " not registered."; |
@@ -619,7 +619,7 @@ ExtensionFunction::ResponseAction GetPreferenceFunction::Run() { |
PrefService* prefs = |
incognito ? profile->GetOffTheRecordPrefs() : profile->GetPrefs(); |
const PrefService::Preference* pref = |
- prefs->FindPreference(browser_pref.c_str()); |
+ prefs->FindPreference(browser_pref); |
CHECK(pref); |
std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue); |
@@ -707,7 +707,7 @@ ExtensionFunction::ResponseAction SetPreferenceFunction::Run() { |
ExtensionPrefs* prefs = ExtensionPrefs::Get(browser_context()); |
const PrefService::Preference* pref = |
- prefs->pref_service()->FindPreference(browser_pref.c_str()); |
+ prefs->pref_service()->FindPreference(browser_pref); |
CHECK(pref); |
// Validate new value. |