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}

1 files changed, 3 insertions, 6 deletions

diff --git a/extensions/common/extension_builder.h b/extensions/common/extension_builder.h
index 4734baa..5fe9801 100644
--- a/extensions/common/extension_builder.h
+++ b/extensions/common/extension_builder.h
@@ -40,13 +40,10 @@ class ExtensionBuilder {
   ExtensionBuilder& SetLocation(Manifest::Location location);
 
   ExtensionBuilder& SetManifest(scoped_ptr<base::DictionaryValue> manifest);
-  ExtensionBuilder& SetManifest(DictionaryBuilder manifest_builder) {
-    return SetManifest(manifest_builder.Build());
-  }
 
-  // Adds the keys from the DictionaryBuilder to the manifest, with new keys
-  // taking precedence.
-  ExtensionBuilder& MergeManifest(DictionaryBuilder& builder);
+  // Merge another manifest into the current manifest, with new keys taking
+  // precedence.
+  ExtensionBuilder& MergeManifest(scoped_ptr<base::DictionaryValue> manifest);
 
   ExtensionBuilder& AddFlags(int init_from_value_flags);