Index: chrome/browser/extensions/api/preference/chrome_direct_setting.cc |
diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting.cc |
index 3dc56c12f959ee03318a8e54f48f4688536ff9d8..a612d302aaf542ce55deb30499021975a55ef016 100644 |
--- a/chrome/browser/extensions/api/preference/chrome_direct_setting.cc |
+++ b/chrome/browser/extensions/api/preference/chrome_direct_setting.cc |
@@ -22,15 +22,15 @@ DirectSettingFunctionBase::DirectSettingFunctionBase() {} |
DirectSettingFunctionBase::~DirectSettingFunctionBase() {} |
PrefService* DirectSettingFunctionBase::GetPrefService() { |
- return GetProfile()->GetPrefs(); |
+ return Profile::FromBrowserContext(browser_context())->GetPrefs(); |
} |
GetDirectSettingFunction::GetDirectSettingFunction() {} |
-bool GetDirectSettingFunction::RunSync() { |
+ExtensionFunction::ResponseAction GetDirectSettingFunction::Run() { |
std::string pref_key; |
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key)); |
- EXTENSION_FUNCTION_VALIDATE(ChromeDirectSettingAPI::Get(GetProfile()) |
+ EXTENSION_FUNCTION_VALIDATE(ChromeDirectSettingAPI::Get(browser_context()) |
->IsPreferenceOnWhitelist(pref_key)); |
const PrefService::Preference* preference = |
@@ -40,19 +40,17 @@ bool GetDirectSettingFunction::RunSync() { |
std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue); |
result->Set(preference_api_constants::kValue, value->DeepCopy()); |
- SetResult(std::move(result)); |
- |
- return true; |
+ return RespondNow(OneArgument(std::move(result))); |
} |
GetDirectSettingFunction::~GetDirectSettingFunction() {} |
SetDirectSettingFunction::SetDirectSettingFunction() {} |
-bool SetDirectSettingFunction::RunSync() { |
+ExtensionFunction::ResponseAction SetDirectSettingFunction::Run() { |
std::string pref_key; |
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key)); |
- EXTENSION_FUNCTION_VALIDATE(ChromeDirectSettingAPI::Get(GetProfile()) |
+ EXTENSION_FUNCTION_VALIDATE(ChromeDirectSettingAPI::Get(browser_context()) |
->IsPreferenceOnWhitelist(pref_key)); |
base::DictionaryValue* details = NULL; |
@@ -71,21 +69,21 @@ bool SetDirectSettingFunction::RunSync() { |
pref_service->Set(pref_key.c_str(), *value); |
- return true; |
+ return RespondNow(NoArguments()); |
} |
SetDirectSettingFunction::~SetDirectSettingFunction() {} |
ClearDirectSettingFunction::ClearDirectSettingFunction() {} |
-bool ClearDirectSettingFunction::RunSync() { |
+ExtensionFunction::ResponseAction ClearDirectSettingFunction::Run() { |
std::string pref_key; |
EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &pref_key)); |
- EXTENSION_FUNCTION_VALIDATE(ChromeDirectSettingAPI::Get(GetProfile()) |
+ EXTENSION_FUNCTION_VALIDATE(ChromeDirectSettingAPI::Get(browser_context()) |
->IsPreferenceOnWhitelist(pref_key)); |
GetPrefService()->ClearPref(pref_key.c_str()); |
- return true; |
+ return RespondNow(NoArguments()); |
} |
ClearDirectSettingFunction::~ClearDirectSettingFunction() {} |