Make Use of Value::GetList API

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 645 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());
   }
 
-  auto args = base::MakeUnique<base::ListValue>();
-  args->Reserve(2);
-  args->Append(std::move(properties));
+  auto args = base::MakeUnique<base::Value>();
+  args->GetList().reserve(2);
+  args->GetList().push_back(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);
+  base::DictionaryValue* raw_properties =
+      static_cast<base::DictionaryValue*>(&args->GetList()[0]);
 
   // 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);
 
-      args->Append(ExtensionTabUtil::CreateTabObject(web_contents)->ToValue());
+      args->GetList().push_back(
+          *ExtensionTabUtil::CreateTabObject(web_contents)->ToValue());
     } else {
-      args->Append(base::MakeUnique<base::DictionaryValue>());
+      args->GetList().push_back(base::DictionaryValue());
     }
   }
 
   if (item->type() == MenuItem::CHECKBOX ||
       item->type() == MenuItem::RADIO) {
     bool was_checked = item->checked();
     raw_properties->SetBoolean("wasChecked", was_checked);
 
     // RADIO items always get set to true when you click on them, but CHECKBOX
     // items get their state toggled.
@@ skipping 14 matching lines @@
         ->GrantIfRequested(extension);
   }
 
   {
     // Dispatch to menu item's .onclick handler (this is the legacy API, from
     // before chrome.contextMenus.onClicked existed).
     std::unique_ptr<Event> event(
         new Event(webview_guest ? events::WEB_VIEW_INTERNAL_CONTEXT_MENUS
                                 : events::CONTEXT_MENUS,
                   webview_guest ? kOnWebviewContextMenus : kOnContextMenus,
-                  std::unique_ptr<base::ListValue>(args->DeepCopy())));
+                  base::ListValue::From(args->CreateDeepCopy())));
     event->restrict_to_browser_context = context;
     event->user_gesture = EventRouter::USER_GESTURE_ENABLED;
     event_router->DispatchEventToExtension(item->extension_id(),
                                            std::move(event));
   }
   {
     // Dispatch to .contextMenus.onClicked handler.
     std::unique_ptr<Event> event(new Event(
         webview_guest ? events::CHROME_WEB_VIEW_INTERNAL_ON_CLICKED
                       : events::CONTEXT_MENUS_ON_CLICKED,
         webview_guest ? api::chrome_web_view_internal::OnClicked::kEventName
                       : api::context_menus::OnClicked::kEventName,
-        std::move(args)));
+        base::ListValue::From(std::move(args))));
     event->restrict_to_browser_context = context;
     event->user_gesture = EventRouter::USER_GESTURE_ENABLED;
     if (webview_guest)
       event->filter_info.SetInstanceID(webview_guest->view_instance_id());
     event_router->DispatchEventToExtension(item->extension_id(),
                                            std::move(event));
   }
 }
 
 void MenuManager::SanitizeRadioList(const MenuItem::OwnedList& item_list) {
@@ skipping 223 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