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

Unified Diff: chromeos/network/network_state_handler.cc

Issue 2229383003: chromeos: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 4 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 | « chromeos/network/network_configuration_handler_unittest.cc ('k') | chromeos/network/policy_applicator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/network_state_handler.cc
diff --git a/chromeos/network/network_state_handler.cc b/chromeos/network/network_state_handler.cc
index 95857609390b8d1d55ef9fe76981c0be3bbf2322..4caaa7ce682850cd5ffa996af2e2a2198d73853c 100644
--- a/chromeos/network/network_state_handler.cc
+++ b/chromeos/network/network_state_handler.cc
@@ -75,8 +75,8 @@ NetworkStateHandler::~NetworkStateHandler() {
// destry the class.
if (!did_shutdown_)
Shutdown();
- STLDeleteContainerPointers(network_list_.begin(), network_list_.end());
- STLDeleteContainerPointers(device_list_.begin(), device_list_.end());
+ base::STLDeleteContainerPointers(network_list_.begin(), network_list_.end());
+ base::STLDeleteContainerPointers(device_list_.begin(), device_list_.end());
}
void NetworkStateHandler::Shutdown() {
@@ -464,7 +464,7 @@ void NetworkStateHandler::UpdateManagedList(ManagedState::ManagedType type,
for (ManagedStateList::iterator iter = managed_list->begin();
iter != managed_list->end(); ++iter) {
ManagedState* managed = *iter;
- DCHECK(!ContainsKey(managed_map, managed->path()));
+ DCHECK(!base::ContainsKey(managed_map, managed->path()));
managed_map[managed->path()] = managed;
}
// Clear the list (pointers are temporarily owned by managed_map).
@@ -494,7 +494,8 @@ void NetworkStateHandler::UpdateManagedList(ManagedState::ManagedType type,
list_entries.insert(path);
}
// Delete any remaining entries in managed_map.
- STLDeleteContainerPairSecondPointers(managed_map.begin(), managed_map.end());
+ base::STLDeleteContainerPairSecondPointers(managed_map.begin(),
+ managed_map.end());
}
void NetworkStateHandler::ProfileListChanged() {
« no previous file with comments | « chromeos/network/network_configuration_handler_unittest.cc ('k') | chromeos/network/policy_applicator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698