| Index: extensions/common/manifest_handlers/background_info.cc
|
| diff --git a/extensions/common/manifest_handlers/background_info.cc b/extensions/common/manifest_handlers/background_info.cc
|
| index c33d22c243634bcc4dea5f550d58c07577d91994..7f39b0090d5fbc823f307d23898cd3a734c105eb 100644
|
| --- a/extensions/common/manifest_handlers/background_info.cc
|
| +++ b/extensions/common/manifest_handlers/background_info.cc
|
| @@ -6,11 +6,12 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/command_line.h"
|
| #include "base/files/file_util.h"
|
| #include "base/lazy_instance.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "extensions/common/constants.h"
|
| @@ -249,7 +250,7 @@ BackgroundManifestHandler::~BackgroundManifestHandler() {
|
|
|
| bool BackgroundManifestHandler::Parse(Extension* extension,
|
| base::string16* error) {
|
| - scoped_ptr<BackgroundInfo> info(new BackgroundInfo);
|
| + std::unique_ptr<BackgroundInfo> info(new BackgroundInfo);
|
| if (!info->Parse(extension, error))
|
| return false;
|
|
|
|
|