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

Unified Diff: net/base/address_tracker_linux.h

Issue 1897033002: Reland 'Convert //net and //chromecast to std::unordered_*' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix TestDownloadRequestHandler 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/android/network_change_notifier_android.cc ('k') | net/base/address_tracker_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/address_tracker_linux.h
diff --git a/net/base/address_tracker_linux.h b/net/base/address_tracker_linux.h
index 80767f6195b5007f95d9b5110560430827595064..747bff9908c3ee9bb7f3430d967a9205836b9def 100644
--- a/net/base/address_tracker_linux.h
+++ b/net/base/address_tracker_linux.h
@@ -13,10 +13,10 @@
#include <stddef.h>
#include <map>
+#include <unordered_set>
#include "base/callback.h"
#include "base/compiler_specific.h"
-#include "base/containers/hash_tables.h"
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/synchronization/condition_variable.h"
@@ -51,10 +51,11 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux :
// NOTE: Only ignore interfaces not used to connect to the internet. Adding
// interfaces used to connect to the internet can cause critical network
// changed signals to be lost allowing incorrect stale state to persist.
- AddressTrackerLinux(const base::Closure& address_callback,
- const base::Closure& link_callback,
- const base::Closure& tunnel_callback,
- const base::hash_set<std::string>& ignored_interfaces);
+ AddressTrackerLinux(
+ const base::Closure& address_callback,
+ const base::Closure& link_callback,
+ const base::Closure& tunnel_callback,
+ const std::unordered_set<std::string>& ignored_interfaces);
~AddressTrackerLinux() override;
// In tracking mode, it starts watching the system configuration for
@@ -67,7 +68,7 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux :
AddressMap GetAddressMap() const;
// Returns set of interface indicies for online interfaces.
- base::hash_set<int> GetOnlineLinks() const;
+ std::unordered_set<int> GetOnlineLinks() const;
// Implementation of NetworkChangeNotifierLinux::GetCurrentConnectionType().
// Safe to call from any thread, but will block until Init() has completed.
@@ -160,10 +161,10 @@ class NET_EXPORT_PRIVATE AddressTrackerLinux :
// Set of interface indices for links that are currently online.
mutable base::Lock online_links_lock_;
- base::hash_set<int> online_links_;
+ std::unordered_set<int> online_links_;
// Set of interface names that should be ignored.
- const base::hash_set<std::string> ignored_interfaces_;
+ const std::unordered_set<std::string> ignored_interfaces_;
base::Lock connection_type_lock_;
bool connection_type_initialized_;
« no previous file with comments | « net/android/network_change_notifier_android.cc ('k') | net/base/address_tracker_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698