| Index: chrome/browser/extensions/api/settings_private/settings_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/settings_private/settings_private_api.cc b/chrome/browser/extensions/api/settings_private/settings_private_api.cc
|
| index cfacf75e77159376dd2dfcde4ceb1381307ee9af..e2b23743721b6e059043be8892035ab784fec91e 100644
|
| --- a/chrome/browser/extensions/api/settings_private/settings_private_api.cc
|
| +++ b/chrome/browser/extensions/api/settings_private/settings_private_api.cc
|
| @@ -4,6 +4,9 @@
|
|
|
| #include "chrome/browser/extensions/api/settings_private/settings_private_api.h"
|
|
|
| +#include <utility>
|
| +
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/extensions/api/settings_private/settings_private_delegate.h"
|
| #include "chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h"
|
| @@ -41,10 +44,12 @@ ExtensionFunction::ResponseAction SettingsPrivateSetPrefFunction::Run() {
|
| delegate->SetPref(parameters->name, parameters->value.get());
|
| switch (result) {
|
| case PrefsUtil::SUCCESS:
|
| - return RespondNow(OneArgument(new base::FundamentalValue(true)));
|
| + return RespondNow(
|
| + OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
|
| case PrefsUtil::PREF_NOT_MODIFIABLE:
|
| // Not an error, but return false to indicate setting the pref failed.
|
| - return RespondNow(OneArgument(new base::FundamentalValue(false)));
|
| + return RespondNow(
|
| + OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
|
| case PrefsUtil::PREF_NOT_FOUND:
|
| return RespondNow(Error("Pref not found: *", parameters->name));
|
| case PrefsUtil::PREF_TYPE_MISMATCH:
|
| @@ -55,7 +60,8 @@ ExtensionFunction::ResponseAction SettingsPrivateSetPrefFunction::Run() {
|
| parameters->name));
|
| }
|
| NOTREACHED();
|
| - return RespondNow(OneArgument(new base::FundamentalValue(false)));
|
| + return RespondNow(
|
| + OneArgument(base::MakeUnique<base::FundamentalValue>(false)));
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -72,7 +78,7 @@ ExtensionFunction::ResponseAction SettingsPrivateGetAllPrefsFunction::Run() {
|
| if (delegate == nullptr)
|
| return RespondNow(Error(kDelegateIsNull));
|
| else
|
| - return RespondNow(OneArgument(delegate->GetAllPrefs().release()));
|
| + return RespondNow(OneArgument(delegate->GetAllPrefs()));
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -96,7 +102,7 @@ ExtensionFunction::ResponseAction SettingsPrivateGetPrefFunction::Run() {
|
| if (value->IsType(base::Value::TYPE_NULL))
|
| return RespondNow(Error("Pref * does not exist", parameters->name));
|
| else
|
| - return RespondNow(OneArgument(value.release()));
|
| + return RespondNow(OneArgument(std::move(value)));
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -115,7 +121,7 @@ ExtensionFunction::ResponseAction
|
| if (delegate == nullptr)
|
| return RespondNow(Error(kDelegateIsNull));
|
| else
|
| - return RespondNow(OneArgument(delegate->GetDefaultZoomPercent().release()));
|
| + return RespondNow(OneArgument(delegate->GetDefaultZoomPercent()));
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| @@ -139,7 +145,8 @@ ExtensionFunction::ResponseAction
|
| return RespondNow(Error(kDelegateIsNull));
|
|
|
| delegate->SetDefaultZoomPercent(parameters->percent);
|
| - return RespondNow(OneArgument(new base::FundamentalValue(true)));
|
| + return RespondNow(
|
| + OneArgument(base::MakeUnique<base::FundamentalValue>(true)));
|
| }
|
|
|
| } // namespace extensions
|
|
|