| Index: chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| diff --git a/chrome/common/extensions/manifest_handlers/theme_handler.cc b/chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| index 5a4105f6467fa9b17aa61ef3290c02dca9e44190..cdee0c3f15f828912fe308e03e0ae22c779de94d 100644
|
| --- a/chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| +++ b/chrome/common/extensions/manifest_handlers/theme_handler.cc
|
| @@ -4,8 +4,9 @@
|
|
|
| #include "chrome/common/extensions/manifest_handlers/theme_handler.h"
|
|
|
| +#include <memory>
|
| +
|
| #include "base/files/file_util.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/grit/generated_resources.h"
|
| @@ -174,7 +175,7 @@ bool ThemeHandler::Parse(Extension* extension, base::string16* error) {
|
| return false;
|
| }
|
|
|
| - scoped_ptr<ThemeInfo> theme_info(new ThemeInfo);
|
| + std::unique_ptr<ThemeInfo> theme_info(new ThemeInfo);
|
| if (!LoadImages(theme_value, error, theme_info.get()))
|
| return false;
|
| if (!LoadColors(theme_value, error, theme_info.get()))
|
|
|