Use unique_ptr<DictionaryValue> in ProxyConfigDictionary

chromeos/network/proxy/proxy_config_handler.cc

 // Copyright (c) 2013 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 "chromeos/network/proxy/proxy_config_handler.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/network/network_handler_callbacks.h"
 #include "chromeos/network/network_profile.h"
 #include "chromeos/network/network_profile_handler.h"
@@ skipping 36 matching lines @@
     network_policy->GetDictionaryWithoutPathExpansion(
         ::onc::network_config::kProxySettings, &proxy_policy);
     if (!proxy_policy) {
       // This policy doesn't set a proxy for this network. Nonetheless, this
       // disallows changes by the user.
       return std::unique_ptr<ProxyConfigDictionary>();
     }
 
     std::unique_ptr<base::DictionaryValue> proxy_dict =
         onc::ConvertOncProxySettingsToProxyConfig(*proxy_policy);
-    return base::MakeUnique<ProxyConfigDictionary>(proxy_dict.get());
+    return base::MakeUnique<ProxyConfigDictionary>(std::move(proxy_dict));
   }
 
   if (network.profile_path().empty())
     return std::unique_ptr<ProxyConfigDictionary>();
 
   const NetworkProfile* profile =
       NetworkHandler::Get()->network_profile_handler()->GetProfileForPath(
           network.profile_path());
   if (!profile) {
     VLOG(1) << "Unknown profile_path '" << network.profile_path() << "'.";
     return std::unique_ptr<ProxyConfigDictionary>();
   }
   if (!profile_prefs && profile->type() == NetworkProfile::TYPE_USER) {
     // This case occurs, for example, if called from the proxy config tracker
     // created for the system request context and the signin screen. Both don't
     // use profile prefs and shouldn't depend on the user's not shared proxy
     // settings.
     VLOG(1)
         << "Don't use unshared settings for system context or signin screen.";
     return std::unique_ptr<ProxyConfigDictionary>();
   }
 
   // No policy set for this network, read instead the user's (shared or
   // unshared) configuration.
   // The user's proxy setting is not stored in the Chrome preference yet. We
   // still rely on Shill storing it.
   const base::DictionaryValue& value = network.proxy_config();
   if (value.empty())
     return std::unique_ptr<ProxyConfigDictionary>();
-  return base::MakeUnique<ProxyConfigDictionary>(&value);
+  return base::MakeUnique<ProxyConfigDictionary>(value.CreateDeepCopy());
 }
 
 void SetProxyConfigForNetwork(const ProxyConfigDictionary& proxy_config,
                               const NetworkState& network) {
   chromeos::ShillServiceClient* shill_service_client =
       DBusThreadManager::Get()->GetShillServiceClient();
 
   // The user's proxy setting is not stored in the Chrome preference yet. We
   // still rely on Shill storing it.
   ProxyPrefs::ProxyMode mode;
@@ skipping 15 matching lines @@
         base::Bind(&NotifyNetworkStateHandler, network.path()),
         base::Bind(&network_handler::ShillErrorCallbackFunction,
                    "SetProxyConfig.SetProperty Failed", network.path(),
                    network_handler::ErrorCallback()));
   }
 }
 
 }  // namespace proxy_config
 
 }  // namespace chromeos