Make extensions::DictionaryBuilder and extensions::ListValue unmovable.

extensions/common/extension_builder.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_COMMON_EXTENSION_BUILDER_H_
 #define EXTENSIONS_COMMON_EXTENSION_BUILDER_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
@@ skipping 22 matching lines @@
   // CHECKs that the extension was created successfully.
   scoped_refptr<Extension> Build();
 
   // Defaults to FilePath().
   ExtensionBuilder& SetPath(const base::FilePath& path);
 
   // Defaults to Manifest::UNPACKED.
   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);
 
   // Defaults to the default extension ID created in Extension::Create.
   ExtensionBuilder& SetID(const std::string& id);
 
  private:
   base::FilePath path_;
   Manifest::Location location_;
   scoped_ptr<base::DictionaryValue> manifest_;
   int flags_;
   std::string id_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionBuilder);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_EXTENSION_BUILDER_H_