Change more base::ListValue methods to use std::unique_ptr.

net/http/http_server_properties_manager_unittest.cc

 // Copyright 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 "net/http/http_server_properties_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "net/base/ip_address.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 233 matching lines @@
   alternative_service_list0->Append(std::move(alternative_service_dict1));
   server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                             alternative_service_list0);
 
   // Set up ServerNetworkStats for https://www.google.com.
   base::DictionaryValue* stats = new base::DictionaryValue;
   stats->SetInteger("srtt", 10);
   server_pref_dict->SetWithoutPathExpansion("network_stats", stats);
 
   // Set the server preference for https://www.google.com.
-  base::DictionaryValue* servers_dict = new base::DictionaryValue;
+  auto servers_dict = base::MakeUnique<base::DictionaryValue>();
   servers_dict->SetWithoutPathExpansion(
       GetParam() >= 5 ? "https://www.google.com" : "www.google.com:443",
       server_pref_dict);
   base::ListValue* servers_list = nullptr;
   if (GetParam() >= 4) {
     servers_list = new base::ListValue;
-    // |servers_list| takes ownership of |servers_dict|.
-    servers_list->AppendIfNotPresent(servers_dict);
-    servers_dict = new base::DictionaryValue;
+    servers_list->AppendIfNotPresent(std::move(servers_dict));
+    servers_dict = base::MakeUnique<base::DictionaryValue>();
   }
 
   // Set the preference for mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
 
   // Set supports_spdy for https://mail.google.com.
   server_pref_dict1->SetBoolean("supports_spdy", true);
 
   // Set up alternative_services for https://mail.google.com.
   std::unique_ptr<base::DictionaryValue> alternative_service_dict2(
       new base::DictionaryValue);
   alternative_service_dict2->SetString("protocol_str", "npn-spdy/3.1");
   alternative_service_dict2->SetInteger("port", 444);
   base::ListValue* alternative_service_list1 = new base::ListValue;
   alternative_service_list1->Append(std::move(alternative_service_dict2));
   server_pref_dict1->SetWithoutPathExpansion("alternative_service",
                                              alternative_service_list1);
 
   // Set up ServerNetworkStats for https://mail.google.com and it is the MRU
   // server.
   base::DictionaryValue* stats1 = new base::DictionaryValue;
   stats1->SetInteger("srtt", 20);
   server_pref_dict1->SetWithoutPathExpansion("network_stats", stats1);
   // Set the server preference for https://mail.google.com.
   servers_dict->SetWithoutPathExpansion(
       GetParam() >= 5 ? "https://mail.google.com" : "mail.google.com:443",
       server_pref_dict1);
   base::DictionaryValue http_server_properties_dict;
   if (GetParam() >= 4) {
-    // |servers_list| takes ownership of |servers_dict|.
-    servers_list->AppendIfNotPresent(servers_dict);
+    servers_list->AppendIfNotPresent(std::move(servers_dict));
     if (GetParam() == 5) {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
     } else {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                               GetParam());
     }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
-    http_server_properties_dict.SetWithoutPathExpansion("servers",
-                                                        servers_dict);
+    http_server_properties_dict.SetWithoutPathExpansion(
+        "servers", std::move(servers_dict));
   }
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
   supports_quic->SetString("address", "127.0.0.1");
   http_server_properties_dict.SetWithoutPathExpansion("supports_quic",
                                                       supports_quic);
 
   // Set quic_server_info for https://www.google.com, https://mail.google.com
   // and https://play.google.com and verify the MRU.
   http_server_props_manager_->SetMaxServerConfigsStoredInProperties(3);
@@ skipping 138 matching lines @@
   alternative_service_list->Append(std::move(alternative_service_dict));
   server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                             alternative_service_list);
 
   // Set up ServerNetworkStats for www.google.com:65536.
   base::DictionaryValue* stats = new base::DictionaryValue;
   stats->SetInteger("srtt", 10);
   server_pref_dict->SetWithoutPathExpansion("network_stats", stats);
 
   // Set the server preference for www.google.com:65536.
-  base::DictionaryValue* servers_dict = new base::DictionaryValue;
+  auto servers_dict = base::MakeUnique<base::DictionaryValue>();
   servers_dict->SetWithoutPathExpansion("www.google.com:65536",
                                         server_pref_dict);
   base::DictionaryValue http_server_properties_dict;
   if (GetParam() >= 4) {
     base::ListValue* servers_list = new base::ListValue;
-    // |servers_list| takes ownership of |servers_dict|.
-    servers_list->AppendIfNotPresent(servers_dict);
+    servers_list->AppendIfNotPresent(std::move(servers_dict));
     if (GetParam() == 5) {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
     } else {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                               GetParam());
     }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
-    http_server_properties_dict.SetWithoutPathExpansion("servers",
-                                                        servers_dict);
+    http_server_properties_dict.SetWithoutPathExpansion(
+        "servers", std::move(servers_dict));
   }
 
   // Set quic_server_info for www.google.com:65536.
   base::DictionaryValue* quic_servers_dict = new base::DictionaryValue;
   base::DictionaryValue* quic_server_pref_dict1 = new base::DictionaryValue;
   quic_server_pref_dict1->SetStringWithoutPathExpansion("server_info",
                                                         "quic_server_info1");
   quic_servers_dict->SetWithoutPathExpansion("http://mail.google.com:65536",
                                              quic_server_pref_dict1);
 
@@ skipping 36 matching lines @@
   std::unique_ptr<base::DictionaryValue> alternative_service_dict(
       new base::DictionaryValue);
   alternative_service_dict->SetString("protocol_str", "npn-h2");
   alternative_service_dict->SetInteger("port", 65536);
   base::ListValue* alternative_service_list = new base::ListValue;
   alternative_service_list->Append(std::move(alternative_service_dict));
   server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                             alternative_service_list);
 
   // Set the server preference for www.google.com:80.
-  base::DictionaryValue* servers_dict = new base::DictionaryValue;
+  auto servers_dict = base::MakeUnique<base::DictionaryValue>();
   servers_dict->SetWithoutPathExpansion("www.google.com:80", server_pref_dict);
   base::DictionaryValue http_server_properties_dict;
   if (GetParam() >= 4) {
     base::ListValue* servers_list = new base::ListValue;
-    // |servers_list| takes ownership of |servers_dict|.
-    servers_list->AppendIfNotPresent(servers_dict);
+    servers_list->AppendIfNotPresent(std::move(servers_dict));
     if (GetParam() == 5) {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
     } else {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                               GetParam());
     }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
-    http_server_properties_dict.SetWithoutPathExpansion("servers",
-                                                        servers_dict);
+    http_server_properties_dict.SetWithoutPathExpansion(
+        "servers", std::move(servers_dict));
   }
 
   // Set up the pref.
   pref_delegate_->SetPrefs(http_server_properties_dict);
 
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   // Verify alternative service is not set.
   EXPECT_FALSE(
@@ skipping 380 matching lines @@
   EXPECT_EQ(0U, settings_map2_ret.size());
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 // https://crbug.com/444956: Add 200 alternative_service servers followed by
 // supports_quic and verify we have read supports_quic from prefs.
 TEST_P(HttpServerPropertiesManagerTest, BadSupportsQuic) {
   ExpectCacheUpdate();
 
-  base::DictionaryValue* servers_dict = new base::DictionaryValue;
+  auto servers_dict = base::MakeUnique<base::DictionaryValue>();
   base::ListValue* servers_list = nullptr;
   if (GetParam() >= 4)
     servers_list = new base::ListValue;
 
   for (int i = 1; i <= 200; ++i) {
     // Set up alternative_service for www.google.com:i.
     std::unique_ptr<base::DictionaryValue> alternative_service_dict(
         new base::DictionaryValue);
     alternative_service_dict->SetString("protocol_str", "quic");
     alternative_service_dict->SetInteger("port", i);
     base::ListValue* alternative_service_list = new base::ListValue;
     alternative_service_list->Append(std::move(alternative_service_dict));
     base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
     server_pref_dict->SetWithoutPathExpansion("alternative_service",
                                               alternative_service_list);
     if (GetParam() >= 5) {
       servers_dict->SetWithoutPathExpansion(
           StringPrintf("https://www.google.com:%d", i), server_pref_dict);
     } else {
       servers_dict->SetWithoutPathExpansion(
           StringPrintf("www.google.com:%d", i), server_pref_dict);
     }
     if (GetParam() >= 4) {
-      // |servers_list| takes ownership of |servers_dict|.
-      servers_list->AppendIfNotPresent(servers_dict);
-      servers_dict = new base::DictionaryValue;
+      servers_list->AppendIfNotPresent(std::move(servers_dict));
+      servers_dict = base::MakeUnique<base::DictionaryValue>();
     }
   }
 
   // Set the server preference for http://mail.google.com server.
   base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
   if (GetParam() >= 5) {
     servers_dict->SetWithoutPathExpansion("https://mail.google.com",
                                           server_pref_dict1);
   } else {
     servers_dict->SetWithoutPathExpansion("mail.google.com:80",
                                           server_pref_dict1);
   }
   base::DictionaryValue http_server_properties_dict;
   if (GetParam() >= 4) {
-    // |servers_list| takes ownership of |servers_dict|.
-    servers_list->AppendIfNotPresent(servers_dict);
+    servers_list->AppendIfNotPresent(std::move(servers_dict));
     if (GetParam() == 5) {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict, -1);
     } else {
       HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                               GetParam());
     }
     http_server_properties_dict.SetWithoutPathExpansion("servers",
                                                         servers_list);
   } else {
     HttpServerPropertiesManager::SetVersion(&http_server_properties_dict,
                                             GetParam());
-    http_server_properties_dict.SetWithoutPathExpansion("servers",
-                                                        servers_dict);
+    http_server_properties_dict.SetWithoutPathExpansion(
+        "servers", std::move(servers_dict));
   }
 
   // Set up SupportsQuic for 127.0.0.1
   base::DictionaryValue* supports_quic = new base::DictionaryValue;
   supports_quic->SetBoolean("used_quic", true);
   supports_quic->SetString("address", "127.0.0.1");
   http_server_properties_dict.SetWithoutPathExpansion("supports_quic",
                                                       supports_quic);
 
   // Set up the pref.
@@ skipping 342 matching lines @@
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnPrefThread();
   // Run the task after shutdown, but before deletion.
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace net