Index: net/tools/net_watcher/net_watcher.cc |
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc |
index 9f07513c655ff31900dfe6bd01b36f4bd7273f44..a4a289b975431c7e6a9c00e6a0fa5fa3996c9646 100644 |
--- a/net/tools/net_watcher/net_watcher.cc |
+++ b/net/tools/net_watcher/net_watcher.cc |
@@ -4,6 +4,7 @@ |
// This is a small utility that watches for and logs network changes. |
+#include <memory> |
#include <string> |
#include "base/at_exit.h" |
@@ -12,7 +13,6 @@ |
#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" |
@@ -69,7 +69,7 @@ const char* ConnectionTypeToString( |
} |
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; |
@@ -177,15 +177,15 @@ int main(int argc, char* argv[]) { |
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())); |