Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr

chrome/browser/chromeos/net/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 "chrome/browser/chromeos/net/proxy_config_handler.h"
 
 #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 "chrome/browser/chromeos/net/onc_utils.h"
 #include "chrome/common/pref_names.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"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
@@ skipping 12 matching lines @@
   if (NetworkHandler::IsInitialized()) {
     NetworkHandler::Get()->network_state_handler()->RequestUpdateForNetwork(
         service_path);
   }
 }
 
 }  // namespace
 
 namespace proxy_config {
 
-scoped_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork(
+std::unique_ptr<ProxyConfigDictionary> GetProxyConfigForNetwork(
     const PrefService* profile_prefs,
     const PrefService* local_state_prefs,
     const NetworkState& network,
     ::onc::ONCSource* onc_source) {
   const base::DictionaryValue* network_policy =
       onc::GetPolicyForNetwork(
           profile_prefs, local_state_prefs, network, onc_source);
 
   if (network_policy) {
     const base::DictionaryValue* proxy_policy = NULL;
     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 scoped_ptr<ProxyConfigDictionary>();
+      return std::unique_ptr<ProxyConfigDictionary>();
     }
 
-    scoped_ptr<base::DictionaryValue> proxy_dict =
+    std::unique_ptr<base::DictionaryValue> proxy_dict =
         onc::ConvertOncProxySettingsToProxyConfig(*proxy_policy);
-    return make_scoped_ptr(new ProxyConfigDictionary(proxy_dict.get()));
+    return base::WrapUnique(new ProxyConfigDictionary(proxy_dict.get()));
   }
 
   if (network.profile_path().empty())
-    return scoped_ptr<ProxyConfigDictionary>();
+    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 scoped_ptr<ProxyConfigDictionary>();
+    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 scoped_ptr<ProxyConfigDictionary>();
+    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 scoped_ptr<ProxyConfigDictionary>();
-  return make_scoped_ptr(new ProxyConfigDictionary(&value));
+    return std::unique_ptr<ProxyConfigDictionary>();
+  return base::WrapUnique(new ProxyConfigDictionary(&value));
 }
 
 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 29 matching lines @@
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kUseSharedProxies, false);
 
   registry->RegisterListPref(prefs::kOpenNetworkConfiguration);
 }
 
 }  // namespace proxy_config
 
 }  // namespace chromeos