Revert of Change base::Value::ListStorage to std::vector<base::Value>

base/values.cc

 // Copyright (c) 2012 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 "base/values.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 17 matching lines @@
               "kTypeNames Has Wrong Size");
 
 std::unique_ptr<Value> CopyWithoutEmptyChildren(const Value& node);
 
 // Make a deep copy of |node|, but don't include empty lists or dictionaries
 // in the copy. It's possible for this function to return NULL and it
 // expects |node| to always be non-NULL.
 std::unique_ptr<ListValue> CopyListWithoutEmptyChildren(const ListValue& list) {
   std::unique_ptr<ListValue> copy;
   for (const auto& entry : list) {
-    std::unique_ptr<Value> child_copy = CopyWithoutEmptyChildren(entry);
+    std::unique_ptr<Value> child_copy = CopyWithoutEmptyChildren(*entry);
     if (child_copy) {
       if (!copy)
         copy.reset(new ListValue);
       copy->Append(std::move(child_copy));
     }
   }
   return copy;
 }
 
 std::unique_ptr<DictionaryValue> CopyDictionaryWithoutEmptyChildren(
@@ skipping 319 matching lines @@
       if ((*lhs.dict_ptr_)->size() != (*rhs.dict_ptr_)->size())
         return false;
       return std::equal(std::begin(**lhs.dict_ptr_), std::end(**lhs.dict_ptr_),
                         std::begin(**rhs.dict_ptr_),
                         [](const Value::DictStorage::value_type& u,
                            const Value::DictStorage::value_type& v) {
                           return std::tie(u.first, *u.second) ==
                                  std::tie(v.first, *v.second);
                         });
     case Value::Type::LIST:
-      return *lhs.list_ == *rhs.list_;
+      if (lhs.list_->size() != rhs.list_->size())
+        return false;
+      return std::equal(
+          std::begin(*lhs.list_), std::end(*lhs.list_), std::begin(*rhs.list_),
+          [](const Value::ListStorage::value_type& u,
+             const Value::ListStorage::value_type& v) { return *u == *v; });
   }
 
   NOTREACHED();
   return false;
 }
 
 bool operator!=(const Value& lhs, const Value& rhs) {
   return !(lhs == rhs);
 }
 
@@ skipping 18 matching lines @@
     // are completely inlined.
     case Value::Type::DICTIONARY:
       return std::lexicographical_compare(
           std::begin(**lhs.dict_ptr_), std::end(**lhs.dict_ptr_),
           std::begin(**rhs.dict_ptr_), std::end(**rhs.dict_ptr_),
           [](const Value::DictStorage::value_type& u,
              const Value::DictStorage::value_type& v) {
             return std::tie(u.first, *u.second) < std::tie(v.first, *v.second);
           });
     case Value::Type::LIST:
-      return *lhs.list_ < *rhs.list_;
+      return std::lexicographical_compare(
+          std::begin(*lhs.list_), std::end(*lhs.list_), std::begin(*rhs.list_),
+          std::end(*rhs.list_),
+          [](const Value::ListStorage::value_type& u,
+             const Value::ListStorage::value_type& v) { return *u < *v; });
   }
 
   NOTREACHED();
   return false;
 }
 
 bool operator>(const Value& lhs, const Value& rhs) {
   return rhs < lhs;
 }
 
@@ skipping 50 matching lines @@
     case Type::DOUBLE:
       InternalCopyFundamentalValue(that);
       return;
 
     case Type::STRING:
       string_value_.Init(*that.string_value_);
       return;
     case Type::BINARY:
       binary_value_.Init(*that.binary_value_);
       return;
-    // DictStorage is a move-only type due to the presence of unique_ptrs. This
-    // is why the explicit copy of every element is necessary here.
-    // TODO(crbug.com/646113): Clean this up when DictStorage can be copied
-    // directly.
+    // DictStorage and ListStorage are move-only types due to the presence of
+    // unique_ptrs. This is why the explicit copy of every element is necessary
+    // here.
+    // TODO(crbug.com/646113): Clean this up when DictStorage and ListStorage
+    // can be copied directly.
     case Type::DICTIONARY:
       dict_ptr_.Init(MakeUnique<DictStorage>());
       for (const auto& it : **that.dict_ptr_) {
         (*dict_ptr_)
             ->emplace_hint((*dict_ptr_)->end(), it.first,
                            MakeUnique<Value>(*it.second));
       }
       return;
     case Type::LIST:
-      list_.Init(*that.list_);
+      list_.Init();
+      list_->reserve(that.list_->size());
+      for (const auto& it : *that.list_)
+        list_->push_back(MakeUnique<Value>(*it));
       return;
   }
 }
 
 void Value::InternalMoveConstructFrom(Value&& that) {
   type_ = that.type_;
 
   switch (type_) {
     case Type::NONE:
     case Type::BOOLEAN:
@@ skipping 29 matching lines @@
     case Type::DOUBLE:
       InternalCopyFundamentalValue(that);
       return;
 
     case Type::STRING:
       *string_value_ = *that.string_value_;
       return;
     case Type::BINARY:
       *binary_value_ = *that.binary_value_;
       return;
-    // DictStorage is a move-only type due to the presence of unique_ptrs. This
-    // is why the explicit call to the copy constructor is necessary here.
-    // TODO(crbug.com/646113): Clean this up when DictStorage can be copied
-    // directly.
-    case Type::DICTIONARY: {
-      Value copy = that;
-      *dict_ptr_ = std::move(*copy.dict_ptr_);
+    // DictStorage and ListStorage are move-only types due to the presence of
+    // unique_ptrs. This is why the explicit call to the copy constructor is
+    // necessary here.
+    // TODO(crbug.com/646113): Clean this up when DictStorage and ListStorage
+    // can be copied directly.
+    case Type::DICTIONARY:
+      *dict_ptr_ = std::move(*Value(that).dict_ptr_);
       return;
-    }
     case Type::LIST:
-      *list_ = *that.list_;
+      *list_ = std::move(*Value(that).list_);
       return;
   }
 }
 
 void Value::InternalCleanup() {
   switch (type_) {
     case Type::NONE:
     case Type::BOOLEAN:
     case Type::INTEGER:
     case Type::DOUBLE:
@@ skipping 486 matching lines @@
   }
   return nullptr;
 }
 
 ListValue::ListValue() : Value(Type::LIST) {}
 
 void ListValue::Clear() {
   list_->clear();
 }
 
-void ListValue::Reserve(size_t n) {
-  list_->reserve(n);
-}
-
 bool ListValue::Set(size_t index, Value* in_value) {
   return Set(index, WrapUnique(in_value));
 }
 
 bool ListValue::Set(size_t index, std::unique_ptr<Value> in_value) {
   if (!in_value)
     return false;
 
   if (index >= list_->size()) {
     // Pad out any intermediate indexes with null settings
     while (index > list_->size())
       Append(MakeUnique<Value>());
     Append(std::move(in_value));
   } else {
-    (*list_)[index] = std::move(*in_value);
+    // TODO(dcheng): remove this DCHECK once the raw pointer version is removed?
+    DCHECK((*list_)[index] != in_value);
+    (*list_)[index] = std::move(in_value);
   }
   return true;
 }
 
 bool ListValue::Get(size_t index, const Value** out_value) const {
   if (index >= list_->size())
     return false;
 
   if (out_value)
-    *out_value = &(*list_)[index];
+    *out_value = (*list_)[index].get();
 
   return true;
 }
 
 bool ListValue::Get(size_t index, Value** out_value) {
   return static_cast<const ListValue&>(*this).Get(
       index,
       const_cast<const Value**>(out_value));
 }
 
@@ skipping 89 matching lines @@
   return static_cast<const ListValue&>(*this).GetList(
       index,
       const_cast<const ListValue**>(out_value));
 }
 
 bool ListValue::Remove(size_t index, std::unique_ptr<Value>* out_value) {
   if (index >= list_->size())
     return false;
 
   if (out_value)
-    *out_value = MakeUnique<Value>(std::move((*list_)[index]));
+    *out_value = std::move((*list_)[index]);
 
   list_->erase(list_->begin() + index);
   return true;
 }
 
 bool ListValue::Remove(const Value& value, size_t* index) {
-  auto it = std::find(list_->begin(), list_->end(), value);
+  for (auto it = list_->begin(); it != list_->end(); ++it) {
+    if (**it == value) {
+      size_t previous_index = it - list_->begin();
+      list_->erase(it);
 
-  if (it == list_->end())
-    return false;
-
-  if (index)
-    *index = std::distance(list_->begin(), it);
-
-  list_->erase(it);
-  return true;
+      if (index)
+        *index = previous_index;
+      return true;
+    }
+  }
+  return false;
 }
 
 ListValue::iterator ListValue::Erase(iterator iter,
                                      std::unique_ptr<Value>* out_value) {
   if (out_value)
-    *out_value = MakeUnique<Value>(std::move(*iter));
+    *out_value = std::move(*ListStorage::iterator(iter));
 
   return list_->erase(iter);
 }
 
 void ListValue::Append(std::unique_ptr<Value> in_value) {
-  list_->push_back(std::move(*in_value));
+  list_->push_back(std::move(in_value));
 }
 
 #if !defined(OS_LINUX)
 void ListValue::Append(Value* in_value) {
   DCHECK(in_value);
   Append(WrapUnique(in_value));
 }
 #endif
 
 void ListValue::AppendBoolean(bool in_value) {
@@ skipping 25 matching lines @@
 
 void ListValue::AppendStrings(const std::vector<string16>& in_values) {
   for (std::vector<string16>::const_iterator it = in_values.begin();
        it != in_values.end(); ++it) {
     AppendString(*it);
   }
 }
 
 bool ListValue::AppendIfNotPresent(std::unique_ptr<Value> in_value) {
   DCHECK(in_value);
-  if (std::find(list_->begin(), list_->end(), *in_value) != list_->end())
-    return false;
-
-  list_->push_back(std::move(*in_value));
+  for (const auto& entry : *list_) {
+    if (*entry == *in_value)
+      return false;
+  }
+  list_->push_back(std::move(in_value));
   return true;
 }
 
 bool ListValue::Insert(size_t index, std::unique_ptr<Value> in_value) {
   DCHECK(in_value);
   if (index > list_->size())
     return false;
 
-  list_->insert(list_->begin() + index, std::move(*in_value));
+  list_->insert(list_->begin() + index, std::move(in_value));
   return true;
 }
 
 ListValue::const_iterator ListValue::Find(const Value& value) const {
-  return std::find(list_->begin(), list_->end(), value);
+  return std::find_if(list_->begin(), list_->end(),
+                      [&value](const std::unique_ptr<Value>& entry) {
+                        return *entry == value;
+                      });
 }
 
 void ListValue::Swap(ListValue* other) {
   CHECK(other->is_list());
   list_->swap(*(other->list_));
 }
 
 ListValue* ListValue::DeepCopy() const {
   return new ListValue(*this);
 }
@@ skipping 15 matching lines @@
 }
 
 std::ostream& operator<<(std::ostream& out, const Value::Type& type) {
   if (static_cast<int>(type) < 0 ||
       static_cast<size_t>(type) >= arraysize(kTypeNames))
     return out << "Invalid Type (index = " << static_cast<int>(type) << ")";
   return out << Value::GetTypeName(type);
 }
 
 }  // namespace base