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

extensions/common/extension_builder.cc

 // 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.
 
 #include "extensions/common/extension_builder.h"
 
 #include <utility>
 
 #include "extensions/common/extension.h"
 
@@ skipping 43 matching lines @@
   location_ = location;
   return *this;
 }
 
 ExtensionBuilder& ExtensionBuilder::SetManifest(
     scoped_ptr<base::DictionaryValue> manifest) {
   manifest_ = std::move(manifest);
   return *this;
 }
 
-ExtensionBuilder& ExtensionBuilder::MergeManifest(DictionaryBuilder& builder) {
-  manifest_->MergeDictionary(builder.Build().get());
+ExtensionBuilder& ExtensionBuilder::MergeManifest(
+    scoped_ptr<base::DictionaryValue> manifest) {
+  manifest_->MergeDictionary(manifest.get());
   return *this;
 }
 
 ExtensionBuilder& ExtensionBuilder::AddFlags(int init_from_value_flags) {
   flags_ |= init_from_value_flags;
   return *this;
 }
 
 ExtensionBuilder& ExtensionBuilder::SetID(const std::string& id) {
   id_ = id;
   return *this;
 }
 
 }  // namespace extensions