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

extensions/common/value_builder.cc

Index: extensions/common/value_builder.cc
diff --git a/extensions/common/value_builder.cc b/extensions/common/value_builder.cc
index 987bbb47b04a1f12d1d30ebb3d3dd9e6ae4d296e..efc2e44fad3e49602083897f0449a0876f55b47b 100644
--- a/extensions/common/value_builder.cc
+++ b/extensions/common/value_builder.cc
@@ -20,14 +20,6 @@ DictionaryBuilder::DictionaryBuilder(const base::DictionaryValue& init)
 
 DictionaryBuilder::~DictionaryBuilder() {}
 
-DictionaryBuilder::DictionaryBuilder(DictionaryBuilder&& other)
-    : dict_(other.Build()) {}
-
-DictionaryBuilder& DictionaryBuilder::operator=(DictionaryBuilder&& other) {
-  dict_ = other.Build();
-  return *this;
-}
-
 std::string DictionaryBuilder::ToJSON() const {
   std::string json;
   base::JSONWriter::WriteWithOptions(
@@ -60,18 +52,6 @@ DictionaryBuilder& DictionaryBuilder::Set(const std::string& path,
 }
 
 DictionaryBuilder& DictionaryBuilder::Set(const std::string& path,
-                                          DictionaryBuilder in_value) {
-  dict_->SetWithoutPathExpansion(path, in_value.Build());
-  return *this;
-}
-
-DictionaryBuilder& DictionaryBuilder::Set(const std::string& path,
-                                          ListBuilder in_value) {
-  dict_->SetWithoutPathExpansion(path, in_value.Build());
-  return *this;
-}
-
-DictionaryBuilder& DictionaryBuilder::Set(const std::string& path,
                                           scoped_ptr<base::Value> in_value) {
   dict_->SetWithoutPathExpansion(path, std::move(in_value));
   return *this;
@@ -90,14 +70,6 @@ ListBuilder::ListBuilder(const base::ListValue& init) : list_(init.DeepCopy()) {
 }
 ListBuilder::~ListBuilder() {}
 
-ListBuilder::ListBuilder(ListBuilder&& other)
-    : list_(other.Build()) {}
-
-ListBuilder& ListBuilder::operator=(ListBuilder&& other) {
-  list_ = other.Build();
-  return *this;
-}
-
 ListBuilder& ListBuilder::Append(int in_value) {
   list_->Append(new base::FundamentalValue(in_value));
   return *this;
@@ -118,13 +90,8 @@ ListBuilder& ListBuilder::Append(const base::string16& in_value) {
   return *this;
 }
 
-ListBuilder& ListBuilder::Append(DictionaryBuilder in_value) {
-  list_->Append(in_value.Build());
-  return *this;
-}
-
-ListBuilder& ListBuilder::Append(ListBuilder in_value) {
-  list_->Append(in_value.Build());
+ListBuilder& ListBuilder::Append(scoped_ptr<base::Value> in_value) {
+  list_->Append(std::move(in_value));
   return *this;
 }