Use unique_ptr<DictionaryValue> in ProxyConfigDictionary

components/proxy_config/pref_proxy_config_tracker_impl.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 <stddef.h>
 
+#include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/values.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/proxy_config/proxy_config_dictionary.h"
@@ skipping 181 matching lines @@
     return net::ProxyConfigService::CONFIG_VALID;
   }
 
   *effective_config_state = ProxyPrefs::CONFIG_SYSTEM;
   *effective_config = system_config;
   return system_availability;
 }
 
 // static
 void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
-  std::unique_ptr<base::DictionaryValue> default_settings(
-      ProxyConfigDictionary::CreateSystem());
+  std::unique_ptr<base::DictionaryValue> default_settings =
+      ProxyConfigDictionary::CreateSystem();
   registry->RegisterDictionaryPref(proxy_config::prefs::kProxy,
                                    std::move(default_settings));
 }
 
 // static
 void PrefProxyConfigTrackerImpl::RegisterProfilePrefs(
     user_prefs::PrefRegistrySyncable* pref_service) {
-  std::unique_ptr<base::DictionaryValue> default_settings(
-      ProxyConfigDictionary::CreateSystem());
+  std::unique_ptr<base::DictionaryValue> default_settings =
+      ProxyConfigDictionary::CreateSystem();
   pref_service->RegisterDictionaryPref(proxy_config::prefs::kProxy,
                                        std::move(default_settings));
   pref_service->RegisterBooleanPref(proxy_config::prefs::kUseSharedProxies,
                                     false);
 }
 
 // static
 ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::ReadPrefConfig(
     const PrefService* pref_service,
     net::ProxyConfig* config) {
   // Clear the configuration and source.
   *config = net::ProxyConfig();
   ProxyPrefs::ConfigState config_state = ProxyPrefs::CONFIG_UNSET;
 
   const PrefService::Preference* pref =
       pref_service->FindPreference(proxy_config::prefs::kProxy);
   DCHECK(pref);
 
   const base::DictionaryValue* dict =
       pref_service->GetDictionary(proxy_config::prefs::kProxy);
   DCHECK(dict);
-  ProxyConfigDictionary proxy_dict(dict);
+  ProxyConfigDictionary proxy_dict(dict->CreateDeepCopy());
 
   if (PrefConfigToNetConfig(proxy_dict, config)) {
     if (!pref->IsUserModifiable() || pref->HasUserSetting()) {
       if (pref->IsManaged())
         config_state = ProxyPrefs::CONFIG_POLICY;
       else if (pref->IsExtensionControlled())
         config_state = ProxyPrefs::CONFIG_EXTENSION;
       else
         config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE;
     } else {
@@ skipping 98 matching lines @@
       (config_state_ != ProxyPrefs::CONFIG_UNSET &&
        !pref_config_.Equals(new_config))) {
     config_state_ = config_state;
     if (config_state_ != ProxyPrefs::CONFIG_UNSET)
       pref_config_ = new_config;
     update_pending_ = true;
   }
   if (update_pending_)
     OnProxyConfigChanged(config_state, new_config);
 }