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

Unified Diff: chrome/browser/extensions/api/messaging/message_service.cc

Issue 2230203002: chrome: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed accidental components/ change 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
Index: chrome/browser/extensions/api/messaging/message_service.cc
diff --git a/chrome/browser/extensions/api/messaging/message_service.cc b/chrome/browser/extensions/api/messaging/message_service.cc
index 92af5069b93526b13bbfa6492eaef5fac2741ac0..0f8d9d8adcdb6df2b0725d8e0cb7ac1d0c0c66c0 100644
--- a/chrome/browser/extensions/api/messaging/message_service.cc
+++ b/chrome/browser/extensions/api/messaging/message_service.cc
@@ -233,7 +233,8 @@ MessageService::MessageService(BrowserContext* context)
MessageService::~MessageService() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- STLDeleteContainerPairSecondPointers(channels_.begin(), channels_.end());
+ base::STLDeleteContainerPairSecondPointers(channels_.begin(),
+ channels_.end());
channels_.clear();
}
@@ -772,8 +773,9 @@ void MessageService::EnqueuePendingMessage(int source_port_id,
PendingMessage(source_port_id, message));
// A channel should only be holding pending messages because it is in one
// of these states.
- DCHECK(!ContainsKey(pending_tls_channel_id_channels_, channel_id));
- DCHECK(!ContainsKey(pending_lazy_background_page_channels_, channel_id));
+ DCHECK(!base::ContainsKey(pending_tls_channel_id_channels_, channel_id));
+ DCHECK(
+ !base::ContainsKey(pending_lazy_background_page_channels_, channel_id));
return;
}
PendingChannelMap::iterator pending_for_tls_channel_id =
@@ -783,7 +785,8 @@ void MessageService::EnqueuePendingMessage(int source_port_id,
PendingMessage(source_port_id, message));
// A channel should only be holding pending messages because it is in one
// of these states.
- DCHECK(!ContainsKey(pending_lazy_background_page_channels_, channel_id));
+ DCHECK(
+ !base::ContainsKey(pending_lazy_background_page_channels_, channel_id));
return;
}
EnqueuePendingMessageForLazyBackgroundLoad(source_port_id,

Powered by Google App Engine
This is Rietveld 408576698