| Index: extensions/common/manifest_handlers/icons_handler_unittest.cc
|
| diff --git a/extensions/common/manifest_handlers/icons_handler_unittest.cc b/extensions/common/manifest_handlers/icons_handler_unittest.cc
|
| index fa644a940ce4f434f250cc93be4c9aa0e382f8a3..7f31f2f2be2e2f6876612e35a4bd2f6601eb8d49 100644
|
| --- a/extensions/common/manifest_handlers/icons_handler_unittest.cc
|
| +++ b/extensions/common/manifest_handlers/icons_handler_unittest.cc
|
| @@ -14,18 +14,19 @@ class ProductIconManifestTest : public ManifestTest {
|
| ProductIconManifestTest() {}
|
|
|
| protected:
|
| - scoped_ptr<base::DictionaryValue> CreateManifest(
|
| + std::unique_ptr<base::DictionaryValue> CreateManifest(
|
| const std::string& extra_icons) {
|
| - scoped_ptr<base::DictionaryValue> manifest = base::DictionaryValue::From(
|
| - base::test::ParseJson("{ \n"
|
| - " \"name\": \"test\", \n"
|
| - " \"version\": \"0.1\", \n"
|
| - " \"manifest_version\": 2, \n"
|
| - " \"icons\": { \n" +
|
| - extra_icons + " \"16\": \"icon1.png\", \n"
|
| - " \"32\": \"icon2.png\" \n"
|
| - " } \n"
|
| - "} \n"));
|
| + std::unique_ptr<base::DictionaryValue> manifest =
|
| + base::DictionaryValue::From(
|
| + base::test::ParseJson("{ \n"
|
| + " \"name\": \"test\", \n"
|
| + " \"version\": \"0.1\", \n"
|
| + " \"manifest_version\": 2, \n"
|
| + " \"icons\": { \n" +
|
| + extra_icons + " \"16\": \"icon1.png\", \n"
|
| + " \"32\": \"icon2.png\" \n"
|
| + " } \n"
|
| + "} \n"));
|
| EXPECT_TRUE(manifest);
|
| return manifest;
|
| }
|
| @@ -37,28 +38,28 @@ class ProductIconManifestTest : public ManifestTest {
|
| TEST_F(ProductIconManifestTest, Sizes) {
|
| // Too big.
|
| {
|
| - scoped_ptr<base::DictionaryValue> ext_manifest =
|
| + std::unique_ptr<base::DictionaryValue> ext_manifest =
|
| CreateManifest("\"100000\": \"icon3.png\", \n");
|
| ManifestData manifest(std::move(ext_manifest), "test");
|
| LoadAndExpectError(manifest, "Invalid key in icons: \"100000\".");
|
| }
|
| // Too small.
|
| {
|
| - scoped_ptr<base::DictionaryValue> ext_manifest =
|
| + std::unique_ptr<base::DictionaryValue> ext_manifest =
|
| CreateManifest("\"0\": \"icon3.png\", \n");
|
| ManifestData manifest(std::move(ext_manifest), "test");
|
| LoadAndExpectError(manifest, "Invalid key in icons: \"0\".");
|
| }
|
| // NaN.
|
| {
|
| - scoped_ptr<base::DictionaryValue> ext_manifest =
|
| + std::unique_ptr<base::DictionaryValue> ext_manifest =
|
| CreateManifest("\"sixteen\": \"icon3.png\", \n");
|
| ManifestData manifest(std::move(ext_manifest), "test");
|
| LoadAndExpectError(manifest, "Invalid key in icons: \"sixteen\".");
|
| }
|
| // Just right.
|
| {
|
| - scoped_ptr<base::DictionaryValue> ext_manifest =
|
| + std::unique_ptr<base::DictionaryValue> ext_manifest =
|
| CreateManifest("\"512\": \"icon3.png\", \n");
|
| ManifestData manifest(std::move(ext_manifest), "test");
|
| scoped_refptr<extensions::Extension> extension =
|
|
|