| Index: extensions/common/manifest_handlers/kiosk_mode_info.cc
|
| diff --git a/extensions/common/manifest_handlers/kiosk_mode_info.cc b/extensions/common/manifest_handlers/kiosk_mode_info.cc
|
| index d625bfd7d36daf17484b4737e5a4953178f51535..2dd0f9b1844e8f022431338e1a3e6f01eab52033 100644
|
| --- a/extensions/common/manifest_handlers/kiosk_mode_info.cc
|
| +++ b/extensions/common/manifest_handlers/kiosk_mode_info.cc
|
| @@ -4,7 +4,8 @@
|
|
|
| #include "extensions/common/manifest_handlers/kiosk_mode_info.h"
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| +#include <memory>
|
| +
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -114,7 +115,7 @@ bool KioskModeHandler::Parse(Extension* extension, base::string16* error) {
|
| }
|
|
|
| for (const base::Value* value : *list) {
|
| - scoped_ptr<KioskSecondaryAppsType> app =
|
| + std::unique_ptr<KioskSecondaryAppsType> app =
|
| KioskSecondaryAppsType::FromValue(*value, error);
|
| if (!app) {
|
| *error = base::ASCIIToUTF16(
|
|
|