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

Unified Diff: net/base/address_tracker_linux.cc

Issue 1884453002: Revert of Convert //net and //chromecast to std::unordered_* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/base/address_tracker_linux.h ('k') | net/base/address_tracker_linux_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/address_tracker_linux.cc
diff --git a/net/base/address_tracker_linux.cc b/net/base/address_tracker_linux.cc
index 7ce4687d382b36feae7c914c46094bf54187d948..59d732c90d79f60a4690cb6278ae1a974b36e6dc 100644
--- a/net/base/address_tracker_linux.cc
+++ b/net/base/address_tracker_linux.cc
@@ -127,7 +127,7 @@
const base::Closure& address_callback,
const base::Closure& link_callback,
const base::Closure& tunnel_callback,
- const std::unordered_set<std::string>& ignored_interfaces)
+ const base::hash_set<std::string>& ignored_interfaces)
: get_interface_name_(GetInterfaceName),
address_callback_(address_callback),
link_callback_(link_callback),
@@ -250,7 +250,7 @@
return address_map_;
}
-std::unordered_set<int> AddressTrackerLinux::GetOnlineLinks() const {
+base::hash_set<int> AddressTrackerLinux::GetOnlineLinks() const {
AddressTrackerAutoLock lock(*this, online_links_lock_);
return online_links_;
}
@@ -442,13 +442,13 @@
void AddressTrackerLinux::UpdateCurrentConnectionType() {
AddressTrackerLinux::AddressMap address_map = GetAddressMap();
- std::unordered_set<int> online_links = GetOnlineLinks();
+ base::hash_set<int> online_links = GetOnlineLinks();
// Strip out tunnel interfaces from online_links
- for (std::unordered_set<int>::const_iterator it = online_links.begin();
+ for (base::hash_set<int>::const_iterator it = online_links.begin();
it != online_links.end();) {
if (IsTunnelInterface(*it)) {
- std::unordered_set<int>::const_iterator tunnel_it = it;
+ base::hash_set<int>::const_iterator tunnel_it = it;
++it;
online_links.erase(*tunnel_it);
} else {
« no previous file with comments | « net/base/address_tracker_linux.h ('k') | net/base/address_tracker_linux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698