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

chrome/browser/extensions/menu_manager.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 "chrome/browser/extensions/menu_manager.h"
 
 #include <algorithm>
 #include <memory>
 #include <tuple>
 #include <utility>
@@ skipping 607 matching lines @@
   if (!item)
     return;
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(browser_context_);
   const Extension* extension =
       registry->enabled_extensions().GetByID(item->extension_id());
 
   if (item->type() == MenuItem::RADIO)
     RadioItemSelected(item);
 
-  std::unique_ptr<base::ListValue> args(new base::ListValue());
 
   std::unique_ptr<base::DictionaryValue> properties(
       new base::DictionaryValue());
   SetIdKeyValue(properties.get(), "menuItemId", item->id());
   if (item->parent_id())
     SetIdKeyValue(properties.get(), "parentMenuItemId", *item->parent_id());
 
   switch (params.media_type) {
     case blink::WebContextMenuData::kMediaTypeImage:
       properties->SetString("mediaType", "image");
@@ skipping 18 matching lines @@
   properties->SetBoolean("editable", params.is_editable);
 
   WebViewGuest* webview_guest = WebViewGuest::FromWebContents(web_contents);
   if (webview_guest) {
     // This is used in web_view_internalcustom_bindings.js.
     // The property is not exposed to developer API.
     properties->SetInteger("webviewInstanceId",
                            webview_guest->view_instance_id());
   }
 
-  base::DictionaryValue* raw_properties = properties.get();
+  auto args = base::MakeUnique<base::ListValue>();
+  args->Reserve(2);
   args->Append(std::move(properties));
+  // |properties| is invalidated at this time, which is why |args| needs to be
+  // queried for the pointer. The obtained pointer is guaranteed to stay valid
+  // even after further Appends, because enough storage was reserved above.
+  base::DictionaryValue* raw_properties = nullptr;
+  args->GetDictionary(0, &raw_properties);
 
   // Add the tab info to the argument list.
   // No tab info in a platform app.
   if (!extension || !extension->is_platform_app()) {
     // Note: web_contents are null in unit tests :(
     if (web_contents) {
       int frame_id = ExtensionApiFrameIdMap::GetFrameId(render_frame_host);
       if (frame_id != ExtensionApiFrameIdMap::kInvalidFrameId)
         raw_properties->SetInteger("frameId", frame_id);
 
@@ skipping 284 matching lines @@
 bool MenuItem::Id::operator!=(const Id& other) const {
   return !(*this == other);
 }
 
 bool MenuItem::Id::operator<(const Id& other) const {
   return std::tie(incognito, extension_key, uid, string_uid) <
     std::tie(other.incognito, other.extension_key, other.uid, other.string_uid);
 }
 
 }  // namespace extensions