| Index: chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
|
| diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
|
| index 942acd30d5277d96dfa60053cf026900f0072318..d3b89632192d97641f216ee1daaff252fff9e8f1 100644
|
| --- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
|
| +++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc
|
| @@ -6,10 +6,11 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| +
|
| #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/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -389,7 +390,8 @@ const std::vector<std::string> ContentScriptsHandler::Keys() const {
|
| }
|
|
|
| bool ContentScriptsHandler::Parse(Extension* extension, base::string16* error) {
|
| - scoped_ptr<ContentScriptsInfo> content_scripts_info(new ContentScriptsInfo);
|
| + std::unique_ptr<ContentScriptsInfo> content_scripts_info(
|
| + new ContentScriptsInfo);
|
| const base::ListValue* scripts_list = NULL;
|
| if (!extension->manifest()->GetList(keys::kContentScripts, &scripts_list)) {
|
| *error = base::ASCIIToUTF16(errors::kInvalidContentScriptsList);
|
|
|