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