| Index: chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
|
| diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
|
| index 1770ca5aef771f215ed662b4edfce139fea537ef..c826529e85bb8b674c345f80ccba35e4927e62bb 100644
|
| --- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
|
| +++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
|
| @@ -245,7 +245,7 @@ AutomationInternalEnableTabFunction::Run() {
|
| EXTENSION_FUNCTION_VALIDATE(automation_info);
|
|
|
| using api::automation_internal::EnableTab::Params;
|
| - scoped_ptr<Params> params(Params::Create(*args_));
|
| + std::unique_ptr<Params> params(Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| content::WebContents* contents = NULL;
|
| if (params->args.tab_id.get()) {
|
| @@ -295,7 +295,7 @@ ExtensionFunction::ResponseAction AutomationInternalEnableFrameFunction::Run() {
|
| // TODO(dtseng): Limited to desktop tree for now pending out of proc iframes.
|
| using api::automation_internal::EnableFrame::Params;
|
|
|
| - scoped_ptr<Params> params(Params::Create(*args_));
|
| + std::unique_ptr<Params> params(Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| content::RenderFrameHost* rfh =
|
| @@ -317,7 +317,7 @@ AutomationInternalPerformActionFunction::Run() {
|
| EXTENSION_FUNCTION_VALIDATE(automation_info && automation_info->interact);
|
|
|
| using api::automation_internal::PerformAction::Params;
|
| - scoped_ptr<Params> params(Params::Create(*args_));
|
| + std::unique_ptr<Params> params(Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| if (params->args.tree_id == kDesktopTreeID) {
|
| @@ -389,7 +389,7 @@ AutomationInternalEnableDesktopFunction::Run() {
|
| return RespondNow(Error("desktop permission must be requested"));
|
|
|
| using api::automation_internal::EnableDesktop::Params;
|
| - scoped_ptr<Params> params(Params::Create(*args_));
|
| + std::unique_ptr<Params> params(Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| // This gets removed when the extension process dies.
|
| @@ -414,7 +414,7 @@ AutomationInternalQuerySelectorFunction::Run() {
|
| EXTENSION_FUNCTION_VALIDATE(automation_info);
|
|
|
| using api::automation_internal::QuerySelector::Params;
|
| - scoped_ptr<Params> params(Params::Create(*args_));
|
| + std::unique_ptr<Params> params(Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| if (params->args.tree_id == kDesktopTreeID) {
|
|
|