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

base/trace_event/trace_event_argument.cc

 // Copyright (c) 2014 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/trace_event/trace_event_argument.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 271 matching lines @@
         SetBaseValueWithCopiedName(it.key(), it.value());
       }
       EndDictionary();
     } break;
 
     case base::Value::Type::LIST: {
       const ListValue* list_value;
       value.GetAsList(&list_value);
       BeginArrayWithCopiedName(name);
       for (const auto& base_value : *list_value)
-        AppendBaseValue(*base_value);
+        AppendBaseValue(base_value);
       EndArray();
     } break;
   }
 }
 
 void TracedValue::AppendBaseValue(const base::Value& value) {
   DCHECK_CURRENT_CONTAINER_IS(kStackTypeArray);
   switch (value.GetType()) {
     case base::Value::Type::NONE:
     case base::Value::Type::BINARY:
@@ skipping 33 matching lines @@
         SetBaseValueWithCopiedName(it.key(), it.value());
       }
       EndDictionary();
     } break;
 
     case base::Value::Type::LIST: {
       const ListValue* list_value;
       value.GetAsList(&list_value);
       BeginArray();
       for (const auto& base_value : *list_value)
-        AppendBaseValue(*base_value);
+        AppendBaseValue(base_value);
       EndArray();
     } break;
   }
 }
 
 std::unique_ptr<base::Value> TracedValue::ToBaseValue() const {
   std::unique_ptr<DictionaryValue> root(new DictionaryValue);
   DictionaryValue* cur_dict = root.get();
   ListValue* cur_list = nullptr;
   std::vector<Value*> stack;
   PickleIterator it(pickle_);
   const char* type;
 
   while (it.ReadBytes(&type, 1)) {
     DCHECK((cur_dict && !cur_list) || (cur_list && !cur_dict));
     switch (*type) {
       case kTypeStartDict: {
         auto* new_dict = new DictionaryValue();
         if (cur_dict) {
           cur_dict->SetWithoutPathExpansion(ReadKeyName(it),
                                             WrapUnique(new_dict));
           stack.push_back(cur_dict);
           cur_dict = new_dict;
         } else {
           cur_list->Append(WrapUnique(new_dict));
+          // |new_dict| is invalidated at this point, so |cur_dict| needs to be
+          // reset.
+          cur_list->GetDictionary(cur_list->GetSize() - 1, &cur_dict);
           stack.push_back(cur_list);
           cur_list = nullptr;
-          cur_dict = new_dict;
         }
       } break;
 
       case kTypeEndArray:
       case kTypeEndDict: {
         if (stack.back()->GetAsDictionary(&cur_dict)) {
           cur_list = nullptr;
         } else if (stack.back()->GetAsList(&cur_list)) {
           cur_dict = nullptr;
         }
         stack.pop_back();
       } break;
 
       case kTypeStartArray: {
         auto* new_list = new ListValue();
         if (cur_dict) {
           cur_dict->SetWithoutPathExpansion(ReadKeyName(it),
                                             WrapUnique(new_list));
           stack.push_back(cur_dict);
           cur_dict = nullptr;
           cur_list = new_list;
         } else {
           cur_list->Append(WrapUnique(new_list));
           stack.push_back(cur_list);
-          cur_list = new_list;
+          // |cur_list| is invalidated at this point, so it needs to be reset.
+          cur_list->GetList(cur_list->GetSize() - 1, &cur_list);
         }
       } break;
 
       case kTypeBool: {
         bool value;
         CHECK(it.ReadBool(&value));
         if (cur_dict) {
           cur_dict->SetBooleanWithoutPathExpansion(ReadKeyName(it), value);
         } else {
           cur_list->AppendBoolean(value);
@@ skipping 54 matching lines @@
     TraceEventMemoryOverhead* overhead) {
   overhead->Add("TracedValue",
                 /* allocated size */
                 pickle_.GetTotalAllocatedSize(),
                 /* resident size */
                 pickle_.size());
 }
 
 }  // namespace trace_event
 }  // namespace base