chrome/browser/extensions/extension_action_manager_unittest.cc - Issue 1739183003: Make extensions::DictionaryBuilder and extensions::ListValue unmovable.

Unified Diff: chrome/browser/extensions/extension_action_manager_unittest.cc

Issue 1739183003: Make extensions::DictionaryBuilder and extensions::ListValue unmovable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc ('K') | « chrome/browser/extensions/app_data_migrator_unittest.cc ('k') | chrome/browser/extensions/extension_action_test_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_action_manager_unittest.cc

diff --git a/chrome/browser/extensions/extension_action_manager_unittest.cc b/chrome/browser/extensions/extension_action_manager_unittest.cc

index f809bbcf0528e54242287c32b49970d82a50e231..74c5e67b11b8c934dc82362ea2ee688fcde0dbe2 100644

--- a/chrome/browser/extensions/extension_action_manager_unittest.cc

+++ b/chrome/browser/extensions/extension_action_manager_unittest.cc

@@ -30,9 +30,10 @@ class ExtensionActionManagerTest : public testing::Test {

protected:

// Build an extension, populating |action_type| key with |action|, and

// "icons" key with |extension_icons|.

- scoped_refptr<Extension> BuildExtension(DictionaryBuilder extension_icons,

- DictionaryBuilder action,

- const char* action_type);

+ scoped_refptr<Extension> BuildExtension(

+ scoped_ptr<base::DictionaryValue> extension_icons,

+ scoped_ptr<base::DictionaryValue> action,

+ const char* action_type);

// Returns true if |action|'s title matches |extension|'s name.

bool TitlesMatch(const Extension& extension, const ExtensionAction& action);

@@ -71,19 +72,20 @@ ExtensionActionManagerTest::ExtensionActionManagerTest()

}

scoped_refptr<Extension> ExtensionActionManagerTest::BuildExtension(

- DictionaryBuilder extension_icons,

- DictionaryBuilder action,

+ scoped_ptr<base::DictionaryValue> extension_icons,

+ scoped_ptr<base::DictionaryValue> action,

const char* action_type) {

std::string id = base::IntToString(curr_id_++);

scoped_refptr<Extension> extension =

ExtensionBuilder()

- .SetManifest(std::move(

+ .SetManifest(

DictionaryBuilder()

.Set("version", "1")

.Set("manifest_version", 2)

.Set("icons", std::move(extension_icons))

.Set(action_type, std::move(action))

- .Set("name", std::string("Test Extension").append(id))))

+ .Set("name", std::string("Test Extension").append(id))

+ .Build())

.SetID(id)

.Build();

registry_->AddEnabled(extension);

@@ -119,10 +121,11 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(

// replacement for missing action default_icons keys. "19" should not be

// replaced because "38" can always be used in its place.

scoped_refptr<Extension> extension =

- BuildExtension(std::move(DictionaryBuilder()

- .Set("48", "icon48.png")

- .Set("128", "icon128.png")),

- DictionaryBuilder(), action_type);

+ BuildExtension(DictionaryBuilder()

+ .Set("48", "icon48.png")

+ .Set("128", "icon128.png")

+ .Build(),

+ DictionaryBuilder().Build(), action_type);

ASSERT_TRUE(extension.get());

const ExtensionAction* action = GetAction(action_type, *extension.get());

@@ -134,8 +137,8 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(

// Test that the action's missing default_icons are not replaced with smaller

// icons.

extension =

- BuildExtension(std::move(DictionaryBuilder().Set("24", "icon24.png")),

- DictionaryBuilder(), action_type);

+ BuildExtension(DictionaryBuilder().Set("24", "icon24.png").Build(),

+ DictionaryBuilder().Build(), action_type);

ASSERT_TRUE(extension.get());

action = GetAction(action_type, *extension.get());

@@ -147,10 +150,11 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(

// Test that an action's 19px icon is not replaced if a 38px action icon

// exists.

extension = BuildExtension(

- std::move(DictionaryBuilder().Set("128", "icon128.png")),

- std::move(DictionaryBuilder().Set(

- "default_icon",

- std::move(DictionaryBuilder().Set("38", "action38.png")))),

+ DictionaryBuilder().Set("128", "icon128.png").Build(),

+ DictionaryBuilder()

+ .Set("default_icon",

+ DictionaryBuilder().Set("38", "action38.png").Build())

+ .Build(),

action_type);

ASSERT_TRUE(extension.get());

@@ -160,15 +164,16 @@ void ExtensionActionManagerTest::TestPopulateMissingValues(

ASSERT_FALSE(IconsMatch(*extension.get(), 128, *action, 19));

// Test that existing default_icons and default_title are not replaced.

- extension = BuildExtension(

- std::move(DictionaryBuilder().Set("128", "icon128.png")),

- std::move(

- DictionaryBuilder()

- .Set("default_title", "Action!")

- .Set("default_icon", std::move(DictionaryBuilder()

- .Set("19", "action19.png")

- .Set("38", "action38.png")))),

- action_type);

+ extension =

+ BuildExtension(DictionaryBuilder().Set("128", "icon128.png").Build(),

+ DictionaryBuilder()

+ .Set("default_title", "Action!")

+ .Set("default_icon", DictionaryBuilder()

+ .Set("19", "action19.png")

+ .Set("38", "action38.png")

+ .Build())

+ .Build(),

+ action_type);

ASSERT_TRUE(extension.get());

action = GetAction(action_type, *extension.get());

@@ -192,11 +197,12 @@ TEST_F(ExtensionActionManagerTest, PopulatePageAction) {

TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) {

// Create an extension with page action defaults.

scoped_refptr<Extension> extension = BuildExtension(

- std::move(DictionaryBuilder().Set("48", "icon48.png")),

- std::move(DictionaryBuilder()

- .Set("default_title", "Action!")

- .Set("default_icon", std::move(DictionaryBuilder().Set(

- "38", "action38.png")))),

+ DictionaryBuilder().Set("48", "icon48.png").Build(),

+ DictionaryBuilder()

+ .Set("default_title", "Action!")

+ .Set("default_icon",

+ DictionaryBuilder().Set("38", "action38.png").Build())

+ .Build(),

kPageAction);

ASSERT_TRUE(extension.get());

@@ -213,8 +219,8 @@ TEST_F(ExtensionActionManagerTest, GetBestFitActionTest) {

// Create a new extension without page action defaults.

extension =

- BuildExtension(std::move(DictionaryBuilder().Set("48", "icon48.png")),

- DictionaryBuilder(), kPageAction);

+ BuildExtension(DictionaryBuilder().Set("48", "icon48.png").Build(),

+ DictionaryBuilder().Build(), kPageAction);

ASSERT_TRUE(extension.get());

action =