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

Unified Diff: mojo/public/cpp/bindings/lib/multiplex_router.cc

Issue 2230863002: mojo: 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 | « mojo/public/cpp/bindings/lib/interface_endpoint_client.cc ('k') | mojo/public/cpp/bindings/lib/router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/bindings/lib/multiplex_router.cc
diff --git a/mojo/public/cpp/bindings/lib/multiplex_router.cc b/mojo/public/cpp/bindings/lib/multiplex_router.cc
index 06ece75447c95ec05893f7ede0b12552f3c5544c..9c6431b01f66489a372e52fb458d73220ff38fde 100644
--- a/mojo/public/cpp/bindings/lib/multiplex_router.cc
+++ b/mojo/public/cpp/bindings/lib/multiplex_router.cc
@@ -346,7 +346,7 @@ void MultiplexRouter::CreateEndpointHandlePair(
id = next_interface_id_value_++;
if (set_interface_id_namespace_bit_)
id |= kInterfaceIdNamespaceMask;
- } while (ContainsKey(endpoints_, id));
+ } while (base::ContainsKey(endpoints_, id));
InterfaceEndpoint* endpoint = new InterfaceEndpoint(this, id);
endpoints_[id] = endpoint;
@@ -384,7 +384,7 @@ void MultiplexRouter::CloseEndpointHandle(InterfaceId id, bool is_local) {
base::AutoLock locker(lock_);
if (!is_local) {
- DCHECK(ContainsKey(endpoints_, id));
+ DCHECK(base::ContainsKey(endpoints_, id));
DCHECK(!IsMasterInterfaceId(id));
// We will receive a NotifyPeerEndpointClosed message from the other side.
@@ -393,7 +393,7 @@ void MultiplexRouter::CloseEndpointHandle(InterfaceId id, bool is_local) {
return;
}
- DCHECK(ContainsKey(endpoints_, id));
+ DCHECK(base::ContainsKey(endpoints_, id));
InterfaceEndpoint* endpoint = endpoints_[id].get();
DCHECK(!endpoint->client());
DCHECK(!endpoint->closed());
@@ -415,7 +415,7 @@ InterfaceEndpointController* MultiplexRouter::AttachEndpointClient(
DCHECK(client);
base::AutoLock locker(lock_);
- DCHECK(ContainsKey(endpoints_, id));
+ DCHECK(base::ContainsKey(endpoints_, id));
InterfaceEndpoint* endpoint = endpoints_[id].get();
endpoint->AttachClient(client, std::move(runner));
@@ -434,7 +434,7 @@ void MultiplexRouter::DetachEndpointClient(
DCHECK(IsValidInterfaceId(id));
base::AutoLock locker(lock_);
- DCHECK(ContainsKey(endpoints_, id));
+ DCHECK(base::ContainsKey(endpoints_, id));
InterfaceEndpoint* endpoint = endpoints_[id].get();
endpoint->DetachClient();
@@ -494,7 +494,7 @@ bool MultiplexRouter::HasAssociatedEndpoints() const {
if (endpoints_.size() == 0)
return false;
- return !ContainsKey(endpoints_, kMasterInterfaceId);
+ return !base::ContainsKey(endpoints_, kMasterInterfaceId);
}
void MultiplexRouter::EnableTestingMode() {
« no previous file with comments | « mojo/public/cpp/bindings/lib/interface_endpoint_client.cc ('k') | mojo/public/cpp/bindings/lib/router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698