Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(180)

Unified Diff: net/tools/net_watcher/net_watcher.cc

Issue 1893083002: Change scoped_ptr to std::unique_ptr in //net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptr-net-all: iwyu Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/tools/get_server_time/get_server_time.cc ('k') | net/tools/quic/end_to_end_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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()));
« no previous file with comments | « net/tools/get_server_time/get_server_time.cc ('k') | net/tools/quic/end_to_end_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698