Make extensions::DictionaryBuilder and extensions::ListValue unmovable.
There's no reason for these classes to be movable. std::move() is just
being used as a synonym for Build().
In addition:
- Build() is fewer characters than std::move().
- clang-format works better when builder syntax is consistently used,
which makes it easier for readers to visually match up deeply nested
builders.
- It's surprising to see std::move() used with what looks like a
temporary.
BUG=none
Review URL: https://codereview.chromium.org/1739183003
Cr-Commit-Position: refs/heads/master@{#378107}
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc
index 12cb23a2..f75a531 100644
--- a/chrome/browser/extensions/extension_web_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -77,10 +77,10 @@
manifest.Set(manifest_keys::kName, "ext1")
.Set(manifest_keys::kVersion, "0.1")
.Set(std::string(manifest_keys::kChromeURLOverrides),
- std::move(DictionaryBuilder().Set("bookmarks", kOverrideResource)));
+ DictionaryBuilder().Set("bookmarks", kOverrideResource).Build());
scoped_refptr<Extension> ext_unpacked(
ExtensionBuilder()
- .SetManifest(std::move(manifest))
+ .SetManifest(manifest.Build())
.SetLocation(Manifest::UNPACKED)
.SetID("abcdefghijabcdefghijabcdefghijaa")
.Build());
@@ -112,10 +112,10 @@
manifest2.Set(manifest_keys::kName, "ext2")
.Set(manifest_keys::kVersion, "0.1")
.Set(std::string(manifest_keys::kChromeURLOverrides),
- std::move(DictionaryBuilder().Set("bookmarks", kOverrideResource2)));
+ DictionaryBuilder().Set("bookmarks", kOverrideResource2).Build());
scoped_refptr<Extension> ext_component(
ExtensionBuilder()
- .SetManifest(std::move(manifest2))
+ .SetManifest(manifest2.Build())
.SetLocation(Manifest::COMPONENT)
.SetID("bbabcdefghijabcdefghijabcdefghij")
.Build());
