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

Unified Diff: chrome/browser/extensions/shared_module_service_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/scripting_permissions_modifier_unittest.cc ('k') | chrome/browser/extensions/test_extension_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/shared_module_service_unittest.cc

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

index 11cd3be857a30ab4df90289b9371cf6b395309eb..4b7d1235febf186ffec8f8a39193bd27f378e3bb 100644

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

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

@@ -38,8 +38,10 @@ scoped_refptr<Extension> CreateExtensionImportingModule(

.Set("version", version)

.Set("manifest_version", 2);

if (!import_id.empty()) {

- builder.Set("import", std::move(ListBuilder().Append(std::move(

- DictionaryBuilder().Set("id", import_id)))));

+ builder.Set("import",

+ ListBuilder()

+ .Append(DictionaryBuilder().Set("id", import_id).Build())

+ .Build());

}

scoped_ptr<base::DictionaryValue> manifest = builder.Build();

@@ -131,8 +133,9 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUninstall) {

.Set("version", "1.0")

.Set("manifest_version", 2)

.Set("export",

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

- "resources", std::move(ListBuilder().Append("foo.js")))))

+ DictionaryBuilder()

+ .Set("resources", ListBuilder().Append("foo.js").Build())

+ .Build())

.Build();

scoped_refptr<Extension> shared_module =

ExtensionBuilder()

@@ -172,8 +175,9 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) {

.Set("version", "1.0")

.Set("manifest_version", 2)

.Set("export",

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

- "resources", std::move(ListBuilder().Append("foo.js")))))

+ DictionaryBuilder()

+ .Set("resources", ListBuilder().Append("foo.js").Build())

+ .Build())

.Build();

scoped_refptr<Extension> shared_module_1 =

ExtensionBuilder()

@@ -189,8 +193,9 @@ TEST_F(SharedModuleServiceUnitTest, PruneSharedModulesOnUpdate) {

.Set("version", "1.0")

.Set("manifest_version", 2)

.Set("export",

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

- "resources", std::move(ListBuilder().Append("foo.js")))))

+ DictionaryBuilder()

+ .Set("resources", ListBuilder().Append("foo.js").Build())

+ .Build())

.Build();

scoped_refptr<Extension> shared_module_2 =

ExtensionBuilder()

@@ -250,11 +255,11 @@ TEST_F(SharedModuleServiceUnitTest, WhitelistedImports) {

.Set("version", "1.0")

.Set("manifest_version", 2)

.Set("export",

- std::move(

- DictionaryBuilder()

- .Set("whitelist",

- std::move(ListBuilder().Append(whitelisted_id)))

- .Set("resources", std::move(ListBuilder().Append("*")))))

+ DictionaryBuilder()

+ .Set("whitelist",

+ ListBuilder().Append(whitelisted_id).Build())

+ .Set("resources", ListBuilder().Append("*").Build())

+ .Build())

.Build();

scoped_refptr<Extension> shared_module =

ExtensionBuilder()