Change scoped_ptr to std::unique_ptr in //net.

net/tools/net_watcher/net_watcher.cc

 // Copyright (c) 2012 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.
 
 // This is a small utility that watches for and logs network changes.
 
+#include <memory>
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "net/base/network_change_notifier.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 
 #if defined(USE_GLIB) && !defined(OS_CHROMEOS)
@@ skipping 36 matching lines @@
     case net::NetworkChangeNotifier::CONNECTION_NONE:
       return "CONNECTION_NONE";
     case net::NetworkChangeNotifier::CONNECTION_BLUETOOTH:
       return "CONNECTION_BLUETOOTH";
     default:
       return "CONNECTION_UNEXPECTED";
   }
 }
 
 std::string ProxyConfigToString(const net::ProxyConfig& config) {
-  scoped_ptr<base::Value> config_value(config.ToValue());
+  std::unique_ptr<base::Value> config_value(config.ToValue());
   std::string str;
   base::JSONWriter::Write(*config_value, &str);
   return str;
 }
 
 const char* ConfigAvailabilityToString(
     net::ProxyConfigService::ConfigAvailability availability) {
   switch (availability) {
     case net::ProxyConfigService::CONFIG_PENDING:
       return "CONFIG_PENDING";
@@ skipping 87 matching lines @@
       command_line->GetSwitchValueASCII(kIgnoreNetifFlag);
   base::hash_set<std::string> ignored_interfaces;
   if (!ignored_netifs_str.empty()) {
     for (const std::string& ignored_netif :
          base::SplitString(ignored_netifs_str, ",", base::TRIM_WHITESPACE,
                            base::SPLIT_WANT_ALL)) {
       LOG(INFO) << "Ignoring: " << ignored_netif;
       ignored_interfaces.insert(ignored_netif);
     }
   }
-  scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
+  std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
       new net::NetworkChangeNotifierLinux(ignored_interfaces));
 #else
-  scoped_ptr<net::NetworkChangeNotifier> network_change_notifier(
+  std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
       net::NetworkChangeNotifier::Create());
 #endif
 
   // Use the network loop as the file loop also.
-  scoped_ptr<net::ProxyConfigService> proxy_config_service(
+  std::unique_ptr<net::ProxyConfigService> proxy_config_service(
       net::ProxyService::CreateSystemProxyConfigService(
           network_loop.task_runner(), network_loop.task_runner()));
 
   // Uses |network_change_notifier|.
   net::NetworkChangeNotifier::AddIPAddressObserver(&net_watcher);
   net::NetworkChangeNotifier::AddConnectionTypeObserver(&net_watcher);
   net::NetworkChangeNotifier::AddDNSObserver(&net_watcher);
   net::NetworkChangeNotifier::AddNetworkChangeObserver(&net_watcher);
 
   proxy_config_service->AddObserver(&net_watcher);
@@ skipping 19 matching lines @@
   proxy_config_service->RemoveObserver(&net_watcher);
 
   // Uses |network_change_notifier|.
   net::NetworkChangeNotifier::RemoveDNSObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveIPAddressObserver(&net_watcher);
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(&net_watcher);
 
   return 0;
 }