| Index: extensions/browser/api/app_window/app_window_api.cc
|
| diff --git a/extensions/browser/api/app_window/app_window_api.cc b/extensions/browser/api/app_window/app_window_api.cc
|
| index 4f5ffa551fea46a1b86c765946810178c4a9936e..e5dd713972400fee3538a8dbe2bb5fc589249f38 100644
|
| --- a/extensions/browser/api/app_window/app_window_api.cc
|
| +++ b/extensions/browser/api/app_window/app_window_api.cc
|
| @@ -80,8 +80,8 @@ namespace {
|
|
|
| // If the same property is specified for the inner and outer bounds, raise an
|
| // error.
|
| -bool CheckBoundsConflict(const scoped_ptr<int>& inner_property,
|
| - const scoped_ptr<int>& outer_property,
|
| +bool CheckBoundsConflict(const std::unique_ptr<int>& inner_property,
|
| + const std::unique_ptr<int>& outer_property,
|
| const std::string& property_name,
|
| std::string* error) {
|
| if (inner_property.get() && outer_property.get()) {
|
| @@ -129,7 +129,7 @@ bool AppWindowCreateFunction::RunAsync() {
|
| if (ExtensionsBrowserClient::Get()->IsShuttingDown())
|
| return false;
|
|
|
| - scoped_ptr<Create::Params> params(Create::Params::Create(*args_));
|
| + std::unique_ptr<Create::Params> params(Create::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| GURL url = extension()->GetResourceURL(params->url);
|
|
|