| Index: chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| index 33cef864bd5d6ac5ea8405f871e20ae44655e3b2..cfa1d2785871d5e0e793b02c9ab59cfb59077dda 100644
|
| --- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| +++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
|
| @@ -65,7 +65,7 @@ ScreenlockPrivateSetLockedFunction::ScreenlockPrivateSetLockedFunction() {}
|
| ScreenlockPrivateSetLockedFunction::~ScreenlockPrivateSetLockedFunction() {}
|
|
|
| bool ScreenlockPrivateSetLockedFunction::RunAsync() {
|
| - scoped_ptr<screenlock::SetLocked::Params> params(
|
| + std::unique_ptr<screenlock::SetLocked::Params> params(
|
| screenlock::SetLocked::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| EasyUnlockService* service = EasyUnlockService::Get(GetProfile());
|
| @@ -95,7 +95,7 @@ ScreenlockPrivateAcceptAuthAttemptFunction::
|
| ~ScreenlockPrivateAcceptAuthAttemptFunction() {}
|
|
|
| bool ScreenlockPrivateAcceptAuthAttemptFunction::RunSync() {
|
| - scoped_ptr<screenlock::AcceptAuthAttempt::Params> params(
|
| + std::unique_ptr<screenlock::AcceptAuthAttempt::Params> params(
|
| screenlock::AcceptAuthAttempt::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -135,10 +135,10 @@ void ScreenlockPrivateEventRouter::DispatchEvent(
|
| events::HistogramValue histogram_value,
|
| const std::string& event_name,
|
| base::Value* arg) {
|
| - scoped_ptr<base::ListValue> args(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> args(new base::ListValue());
|
| if (arg)
|
| args->Append(arg);
|
| - scoped_ptr<Event> event(
|
| + std::unique_ptr<Event> event(
|
| new Event(histogram_value, event_name, std::move(args)));
|
| EventRouter::Get(browser_context_)->BroadcastEvent(std::move(event));
|
| }
|
| @@ -164,11 +164,11 @@ bool ScreenlockPrivateEventRouter::OnAuthAttempted(
|
| if (!router->HasEventListener(screenlock::OnAuthAttempted::kEventName))
|
| return false;
|
|
|
| - scoped_ptr<base::ListValue> args(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> args(new base::ListValue());
|
| args->AppendString(screenlock::ToString(FromLockHandlerAuthType(auth_type)));
|
| args->AppendString(value);
|
|
|
| - scoped_ptr<Event> event(
|
| + std::unique_ptr<Event> event(
|
| new Event(events::SCREENLOCK_PRIVATE_ON_AUTH_ATTEMPTED,
|
| screenlock::OnAuthAttempted::kEventName, std::move(args)));
|
| router->BroadcastEvent(std::move(event));
|
|
|