diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/tools/net_watcher | |
parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/tools/net_watcher')
-rw-r--r-- | chromium/net/tools/net_watcher/net_watcher.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chromium/net/tools/net_watcher/net_watcher.cc b/chromium/net/tools/net_watcher/net_watcher.cc index 9f07513c655..b623954c6e6 100644 --- a/chromium/net/tools/net_watcher/net_watcher.cc +++ b/chromium/net/tools/net_watcher/net_watcher.cc @@ -4,7 +4,9 @@ // This is a small utility that watches for and logs network changes. +#include <memory> #include <string> +#include <unordered_set> #include "base/at_exit.h" #include "base/command_line.h" @@ -12,7 +14,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 +70,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; @@ -168,7 +169,7 @@ int main(int argc, char* argv[]) { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); std::string ignored_netifs_str = command_line->GetSwitchValueASCII(kIgnoreNetifFlag); - base::hash_set<std::string> ignored_interfaces; + std::unordered_set<std::string> ignored_interfaces; if (!ignored_netifs_str.empty()) { for (const std::string& ignored_netif : base::SplitString(ignored_netifs_str, ",", base::TRIM_WHITESPACE, @@ -177,15 +178,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())); |