Use unique_ptr<DictionaryValue> in ProxyConfigDictionary

components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc

 // Copyright (c) 2011 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 "components/proxy_config/pref_proxy_config_tracker_impl.h"
 
 #include <memory>
 #include <string>
 
 #include "base/files/file_path.h"
-#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
 #include "components/proxy_config/proxy_config_pref_names.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_list.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 89 matching lines @@
 };
 
 TEST_F(PrefProxyConfigTrackerImplTest, BaseConfiguration) {
   net::ProxyConfig actual_config;
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_EQ(GURL(kFixedPacUrl), actual_config.pac_url());
 }
 
 TEST_F(PrefProxyConfigTrackerImplTest, DynamicPrefOverrides) {
-  pref_service_->SetManagedPref(
-      proxy_config::prefs::kProxy,
-      base::WrapUnique(ProxyConfigDictionary::CreateFixedServers(
-          "http://example.com:3128", std::string())));
+  pref_service_->SetManagedPref(proxy_config::prefs::kProxy,
+                                ProxyConfigDictionary::CreateFixedServers(
+                                    "http://example.com:3128", std::string()));
   base::RunLoop().RunUntilIdle();
 
   net::ProxyConfig actual_config;
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_FALSE(actual_config.auto_detect());
   EXPECT_EQ(net::ProxyConfig::ProxyRules::TYPE_SINGLE_PROXY,
             actual_config.proxy_rules().type);
   EXPECT_EQ(actual_config.proxy_rules().single_proxies.Get(),
             net::ProxyServer::FromURI("http://example.com:3128",
                                       net::ProxyServer::SCHEME_HTTP));
 
-  pref_service_->SetManagedPref(
-      proxy_config::prefs::kProxy,
-      base::WrapUnique(ProxyConfigDictionary::CreateAutoDetect()));
+  pref_service_->SetManagedPref(proxy_config::prefs::kProxy,
+                                ProxyConfigDictionary::CreateAutoDetect());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.auto_detect());
 }
 
 // Compares proxy configurations, but allows different identifiers.
 MATCHER_P(ProxyConfigMatches, config, "") {
   net::ProxyConfig reference(config);
@@ skipping 17 matching lines @@
   Mock::VerifyAndClearExpectations(&observer);
 
   // Override configuration, this should trigger a notification.
   net::ProxyConfig pref_config;
   pref_config.set_pac_url(GURL(kFixedPacUrl));
 
   EXPECT_CALL(observer, OnProxyConfigChanged(ProxyConfigMatches(pref_config),
                                              CONFIG_VALID)).Times(1);
   pref_service_->SetManagedPref(
       proxy_config::prefs::kProxy,
-      base::WrapUnique(
-          ProxyConfigDictionary::CreatePacScript(kFixedPacUrl, false)));
+      ProxyConfigDictionary::CreatePacScript(kFixedPacUrl, false));
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   // Since there are pref overrides, delegate changes should be ignored.
   net::ProxyConfig config3;
   config3.proxy_rules().ParseFromString("http=config3:80");
   EXPECT_CALL(observer, OnProxyConfigChanged(_, _)).Times(0);
   fixed_config_.set_auto_detect(true);
   delegate_service_->SetProxyConfig(config3, CONFIG_VALID);
   base::RunLoop().RunUntilIdle();
@@ skipping 29 matching lines @@
 
   // Prepare test data.
   net::ProxyConfig recommended_config = net::ProxyConfig::CreateAutoDetect();
   net::ProxyConfig user_config =
       net::ProxyConfig::CreateFromCustomPacURL(GURL(kFixedPacUrl));
 
   // Set a recommended pref.
   EXPECT_CALL(observer,
               OnProxyConfigChanged(ProxyConfigMatches(recommended_config),
                                    CONFIG_VALID)).Times(1);
-  pref_service_->SetRecommendedPref(
-      proxy_config::prefs::kProxy,
-      base::WrapUnique(ProxyConfigDictionary::CreateAutoDetect()));
+  pref_service_->SetRecommendedPref(proxy_config::prefs::kProxy,
+                                    ProxyConfigDictionary::CreateAutoDetect());
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_EQ(CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.Equals(recommended_config));
 
   // Override in user prefs.
   EXPECT_CALL(observer,
               OnProxyConfigChanged(ProxyConfigMatches(user_config),
                                    CONFIG_VALID)).Times(1);
   pref_service_->SetManagedPref(
       proxy_config::prefs::kProxy,
-      base::WrapUnique(
-          ProxyConfigDictionary::CreatePacScript(kFixedPacUrl, false)));
+      ProxyConfigDictionary::CreatePacScript(kFixedPacUrl, false));
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_EQ(CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.Equals(user_config));
 
   // Go back to recommended pref.
   EXPECT_CALL(observer,
               OnProxyConfigChanged(ProxyConfigMatches(recommended_config),
                                    CONFIG_VALID)).Times(1);
   pref_service_->RemoveManagedPref(proxy_config::prefs::kProxy);
   base::RunLoop().RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
   EXPECT_EQ(CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_TRUE(actual_config.Equals(recommended_config));
 
   proxy_config_service_->RemoveObserver(&observer);
 }
 
 TEST_F(PrefProxyConfigTrackerImplTest, ExplicitSystemSettings) {
-  pref_service_->SetRecommendedPref(
-      proxy_config::prefs::kProxy,
-      base::WrapUnique(ProxyConfigDictionary::CreateAutoDetect()));
-  pref_service_->SetUserPref(
-      proxy_config::prefs::kProxy,
-      base::WrapUnique(ProxyConfigDictionary::CreateSystem()));
+  pref_service_->SetRecommendedPref(proxy_config::prefs::kProxy,
+                                    ProxyConfigDictionary::CreateAutoDetect());
+  pref_service_->SetUserPref(proxy_config::prefs::kProxy,
+                             ProxyConfigDictionary::CreateSystem());
   base::RunLoop().RunUntilIdle();
 
   // Test if we actually use the system setting, which is |kFixedPacUrl|.
   net::ProxyConfig actual_config;
   EXPECT_EQ(net::ProxyConfigService::CONFIG_VALID,
             proxy_config_service_->GetLatestProxyConfig(&actual_config));
   EXPECT_EQ(GURL(kFixedPacUrl), actual_config.pac_url());
 }
 
 }  // namespace