Use std::unique_ptr for base::DictionaryValue and base::ListValue's internal store.

chrome/browser/ui/webui/md_downloads/downloads_list_tracker_unittest.cc

 // Copyright 2015 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/ui/webui/md_downloads/downloads_list_tracker.h"
 
 #include <limits.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 12 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::DownloadItem;
 using content::MockDownloadItem;
 using DownloadVector = std::vector<DownloadItem*>;
 using testing::_;
 using testing::Return;
 
 namespace {
 
-uint64_t GetId(const base::Value* value) {
+uint64_t GetId(const base::Value& value) {
   const base::DictionaryValue* dict;
-  CHECK(value->GetAsDictionary(&dict));
+  CHECK(value.GetAsDictionary(&dict));
 
   int id;
   CHECK(dict->GetInteger("id", &id));
   CHECK_GE(id, 0);
   return static_cast<uint64_t>(id);
 }
 
-std::vector<uint64_t> GetIds(const base::Value* value) {
-  CHECK(value);
-
+std::vector<uint64_t> GetIds(const base::Value& value) {
   std::vector<uint64_t> ids;
 
-  if (value->GetType() == base::Value::TYPE_LIST) {
-    const base::ListValue* list;
-    value->GetAsList(&list);
-
-    for (auto* list_item : *list)
-      ids.push_back(GetId(list_item));
+  const base::ListValue* list;
+  if (value.GetAsList(&list)) {
+    for (const auto& list_item : *list)
+      ids.push_back(GetId(*list_item));
   } else {
     ids.push_back(GetId(value));
   }
 
   return ids;
 }
 
 int GetIndex(const base::Value* value) {
   CHECK(value);
   int index;
@@ skipping 114 matching lines @@
   ASSERT_TRUE(tracker()->GetItemForTesting(0));
   EXPECT_TRUE(web_ui()->call_data().empty());
 
   tracker()->StartAndSendChunk();
   ASSERT_FALSE(web_ui()->call_data().empty());
 
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[0]->function_name());
   EXPECT_EQ(0, GetIndex(web_ui()->call_data()[0]->arg1()));
 
-  std::vector<uint64_t> ids = GetIds(web_ui()->call_data()[0]->arg2());
+  std::vector<uint64_t> ids = GetIds(*web_ui()->call_data()[0]->arg2());
   ASSERT_FALSE(ids.empty());
   EXPECT_EQ(first_item->GetId(), ids[0]);
 }
 
 // The page is in a loading state until it gets an insertItems call. Ensure that
 // happens even without downloads.
 TEST_F(DownloadsListTrackerTest, EmptyGetAllItemsStillCallsInsertItems) {
   CreateTracker();
 
   ASSERT_FALSE(tracker()->GetItemForTesting(0));
   ASSERT_TRUE(web_ui()->call_data().empty());
 
   tracker()->StartAndSendChunk();
 
   ASSERT_FALSE(web_ui()->call_data().empty());
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[0]->function_name());
   ASSERT_TRUE(web_ui()->call_data()[0]->arg2());
-  EXPECT_TRUE(GetIds(web_ui()->call_data()[0]->arg2()).empty());
+  EXPECT_TRUE(GetIds(*web_ui()->call_data()[0]->arg2()).empty());
 }
 
 TEST_F(DownloadsListTrackerTest, OnDownloadCreatedCallsInsertItems) {
   CreateTracker();
   tracker()->StartAndSendChunk();
   web_ui()->ClearTrackedCalls();
 
   ASSERT_FALSE(tracker()->GetItemForTesting(0));
   DownloadItem* first_item = CreateNextItem();
   tracker()->OnDownloadCreated(manager(), first_item);
 
   ASSERT_FALSE(web_ui()->call_data().empty());
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[0]->function_name());
   EXPECT_EQ(0, GetIndex(web_ui()->call_data()[0]->arg1()));
 
-  std::vector<uint64_t> ids = GetIds(web_ui()->call_data()[0]->arg2());
+  std::vector<uint64_t> ids = GetIds(*web_ui()->call_data()[0]->arg2());
   ASSERT_FALSE(ids.empty());
   EXPECT_EQ(first_item->GetId(), ids[0]);
 }
 
 TEST_F(DownloadsListTrackerTest, OnDownloadRemovedCallsRemoveItem) {
   DownloadItem* first_item = CreateNextItem();
 
   CreateTracker();
   tracker()->StartAndSendChunk();
   web_ui()->ClearTrackedCalls();
@@ skipping 34 matching lines @@
   DownloadItem* first_item = CreateNextItem();
   DownloadItemModel(first_item).SetShouldShowInShelf(false);
 
   CreateTracker();
   tracker()->StartAndSendChunk();
 
   ASSERT_FALSE(web_ui()->call_data().empty());
 
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[0]->function_name());
-  EXPECT_TRUE(GetIds(web_ui()->call_data()[0]->arg2()).empty());
+  EXPECT_TRUE(GetIds(*web_ui()->call_data()[0]->arg2()).empty());
 }
 
 TEST_F(DownloadsListTrackerTest, Incognito) {
   testing::NiceMock<content::MockDownloadManager> incognito_manager;
   ON_CALL(incognito_manager, GetBrowserContext()).WillByDefault(Return(
       TestingProfile::Builder().BuildIncognito(profile())));
 
   MockDownloadItem item;
   EXPECT_CALL(item, GetId()).WillRepeatedly(Return(0));
 
@@ skipping 12 matching lines @@
 
   CreateTracker();
   tracker()->SetChunkSizeForTesting(3);
   tracker()->StartAndSendChunk();
 
   ASSERT_FALSE(web_ui()->call_data().empty());
 
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[0]->function_name());
   EXPECT_EQ(0, GetIndex(web_ui()->call_data()[0]->arg1()));
-  EXPECT_EQ(3u, GetIds(web_ui()->call_data()[0]->arg2()).size());
+  EXPECT_EQ(3u, GetIds(*web_ui()->call_data()[0]->arg2()).size());
 
   tracker()->StartAndSendChunk();
   ASSERT_GE(2u, web_ui()->call_data().size());
 
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[1]->function_name());
   EXPECT_EQ(3, GetIndex(web_ui()->call_data()[1]->arg1()));
-  EXPECT_EQ(2u, GetIds(web_ui()->call_data()[1]->arg2()).size());
+  EXPECT_EQ(2u, GetIds(*web_ui()->call_data()[1]->arg2()).size());
 }
 
 TEST_F(DownloadsListTrackerTest, IgnoreUnsentItemUpdates) {
   DownloadItem* unsent_item = CreateNextItem();
   CreateNextItem();
 
   CreateTracker();
   tracker()->SetChunkSizeForTesting(1);
   tracker()->StartAndSendChunk();
 
   ASSERT_FALSE(web_ui()->call_data().empty());
 
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[0]->function_name());
-  EXPECT_EQ(1u, GetIds(web_ui()->call_data()[0]->arg2()).size());
+  EXPECT_EQ(1u, GetIds(*web_ui()->call_data()[0]->arg2()).size());
 
   tracker()->OnDownloadUpdated(manager(), unsent_item);
   EXPECT_EQ(1u, web_ui()->call_data().size());
 }
 
 TEST_F(DownloadsListTrackerTest, IgnoreUnsentItemRemovals) {
   DownloadItem* unsent_item = CreateNextItem();
   CreateNextItem();
 
   CreateTracker();
   tracker()->SetChunkSizeForTesting(1);
   tracker()->StartAndSendChunk();
 
   ASSERT_FALSE(web_ui()->call_data().empty());
 
   EXPECT_EQ("downloads.Manager.insertItems",
             web_ui()->call_data()[0]->function_name());
-  EXPECT_EQ(1u, GetIds(web_ui()->call_data()[0]->arg2()).size());
+  EXPECT_EQ(1u, GetIds(*web_ui()->call_data()[0]->arg2()).size());
 
   DownloadItemModel(unsent_item).SetShouldShowInShelf(false);
   tracker()->OnDownloadUpdated(manager(), unsent_item);
   EXPECT_EQ(1u, web_ui()->call_data().size());
 
   DownloadItemModel(unsent_item).SetShouldShowInShelf(true);
   tracker()->OnDownloadUpdated(manager(), unsent_item);
   EXPECT_EQ(1u, web_ui()->call_data().size());
 }