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

Unified Diff: chromeos/dbus/nfc_client_helpers.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/dbus/fake_shill_service_client.cc ('k') | chromeos/disks/disk_mount_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/nfc_client_helpers.cc
diff --git a/chromeos/dbus/nfc_client_helpers.cc b/chromeos/dbus/nfc_client_helpers.cc
index 1469d26d27ef9744e4bdb8308b15134fca8a73bf..2bdad84f2b08ccc67c801b087e863196a93562fc 100644
--- a/chromeos/dbus/nfc_client_helpers.cc
+++ b/chromeos/dbus/nfc_client_helpers.cc
@@ -92,7 +92,7 @@ void DBusObjectMap::UpdateObjects(const ObjectPathVector& object_paths) {
// won't access it after the iterator becomes invalidated.
const dbus::ObjectPath &object_path = iter->first;
++iter;
- if (!ContainsKey(object_path_set, object_path))
+ if (!base::ContainsKey(object_path_set, object_path))
RemoveObject(object_path);
}
}
@@ -194,7 +194,7 @@ bool ObjectProxyTree::CreateObjectMap(const dbus::ObjectPath& object_path,
const std::string& service_name,
DBusObjectMap::Delegate* delegate,
dbus::Bus* bus) {
- if (ContainsKey(paths_to_object_maps_, object_path)) {
+ if (base::ContainsKey(paths_to_object_maps_, object_path)) {
LOG(ERROR) << "Mapping already exists for object path: "
<< object_path.value();
return false;
« no previous file with comments | « chromeos/dbus/fake_shill_service_client.cc ('k') | chromeos/disks/disk_mount_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698