| Index: chrome/browser/extensions/api/terminal/terminal_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
|
| index 375f32a82258fad27997ca12be4d4bed4ff6a0a7..8dd7ee6f4a19c704a393709c8457fa56b0656e7d 100644
|
| --- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc
|
| +++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
|
| @@ -67,7 +67,7 @@ void NotifyProcessOutput(content::BrowserContext* browser_context,
|
| return;
|
| }
|
|
|
| - scoped_ptr<base::ListValue> args(new base::ListValue());
|
| + std::unique_ptr<base::ListValue> args(new base::ListValue());
|
| args->Append(new base::FundamentalValue(tab_id));
|
| args->Append(new base::FundamentalValue(terminal_id));
|
| args->Append(new base::StringValue(output_type));
|
| @@ -76,7 +76,7 @@ void NotifyProcessOutput(content::BrowserContext* browser_context,
|
| extensions::EventRouter* event_router =
|
| extensions::EventRouter::Get(browser_context);
|
| if (event_router) {
|
| - scoped_ptr<extensions::Event> event(new extensions::Event(
|
| + std::unique_ptr<extensions::Event> event(new extensions::Event(
|
| extensions::events::TERMINAL_PRIVATE_ON_PROCESS_OUTPUT,
|
| terminal_private::OnProcessOutput::kEventName, std::move(args)));
|
| event_router->DispatchEventToExtension(extension_id, std::move(event));
|
| @@ -107,7 +107,7 @@ TerminalPrivateOpenTerminalProcessFunction::
|
|
|
| ExtensionFunction::ResponseAction
|
| TerminalPrivateOpenTerminalProcessFunction::Run() {
|
| - scoped_ptr<OpenTerminalProcess::Params> params(
|
| + std::unique_ptr<OpenTerminalProcess::Params> params(
|
| OpenTerminalProcess::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -174,7 +174,7 @@ void TerminalPrivateOpenTerminalProcessFunction::RespondOnUIThread(
|
| }
|
|
|
| ExtensionFunction::ResponseAction TerminalPrivateSendInputFunction::Run() {
|
| - scoped_ptr<SendInput::Params> params(SendInput::Params::Create(*args_));
|
| + std::unique_ptr<SendInput::Params> params(SendInput::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| // Registry lives on the FILE thread.
|
| @@ -206,7 +206,7 @@ TerminalPrivateCloseTerminalProcessFunction::
|
|
|
| ExtensionFunction::ResponseAction
|
| TerminalPrivateCloseTerminalProcessFunction::Run() {
|
| - scoped_ptr<CloseTerminalProcess::Params> params(
|
| + std::unique_ptr<CloseTerminalProcess::Params> params(
|
| CloseTerminalProcess::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -241,7 +241,7 @@ TerminalPrivateOnTerminalResizeFunction::
|
|
|
| ExtensionFunction::ResponseAction
|
| TerminalPrivateOnTerminalResizeFunction::Run() {
|
| - scoped_ptr<OnTerminalResize::Params> params(
|
| + std::unique_ptr<OnTerminalResize::Params> params(
|
| OnTerminalResize::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| @@ -273,7 +273,7 @@ void TerminalPrivateOnTerminalResizeFunction::RespondOnUIThread(bool success) {
|
| TerminalPrivateAckOutputFunction::~TerminalPrivateAckOutputFunction() {}
|
|
|
| ExtensionFunction::ResponseAction TerminalPrivateAckOutputFunction::Run() {
|
| - scoped_ptr<AckOutput::Params> params(AckOutput::Params::Create(*args_));
|
| + std::unique_ptr<AckOutput::Params> params(AckOutput::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| content::WebContents* caller_contents = GetSenderWebContents();
|
|
|