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

Unified Diff: extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc

Issue 216513002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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: extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
diff --git a/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
index 31eeeabd1e1b69c9fea0a6a4d6b96189022cd2aa..2818857f0b6fe87207733bf95207adcbd3abae62 100644
--- a/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
+++ b/extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc
@@ -28,7 +28,7 @@ TCPServerSocketEventDispatcher::GetFactoryInstance() {
// static
TCPServerSocketEventDispatcher* TCPServerSocketEventDispatcher::Get(
content::BrowserContext* context) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
return BrowserContextKeyedAPIFactory<TCPServerSocketEventDispatcher>::Get(
context);
@@ -65,7 +65,7 @@ TCPServerSocketEventDispatcher::AcceptParams::~AcceptParams() {}
void TCPServerSocketEventDispatcher::OnServerSocketListen(
const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
StartSocketAccept(extension_id, socket_id);
}
@@ -73,7 +73,7 @@ void TCPServerSocketEventDispatcher::OnServerSocketListen(
void TCPServerSocketEventDispatcher::OnServerSocketResume(
const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
StartSocketAccept(extension_id, socket_id);
}
@@ -81,7 +81,7 @@ void TCPServerSocketEventDispatcher::OnServerSocketResume(
void TCPServerSocketEventDispatcher::StartSocketAccept(
const std::string& extension_id,
int socket_id) {
- DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+ DCHECK_CURRENTLY_ON(thread_id_);
AcceptParams params;
params.thread_id = thread_id_;
@@ -96,7 +96,7 @@ void TCPServerSocketEventDispatcher::StartSocketAccept(
// static
void TCPServerSocketEventDispatcher::StartAccept(const AcceptParams& params) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
ResumableTCPServerSocket* socket =
params.server_sockets->Get(params.extension_id, params.socket_id);
@@ -120,7 +120,7 @@ void TCPServerSocketEventDispatcher::AcceptCallback(
const AcceptParams& params,
int result_code,
net::TCPClientSocket* socket) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
if (result_code >= 0) {
ResumableTCPSocket* client_socket =
@@ -169,7 +169,7 @@ void TCPServerSocketEventDispatcher::AcceptCallback(
// static
void TCPServerSocketEventDispatcher::PostEvent(const AcceptParams& params,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+ DCHECK_CURRENTLY_ON(params.thread_id);
BrowserThread::PostTask(BrowserThread::UI,
FROM_HERE,
@@ -184,7 +184,7 @@ void TCPServerSocketEventDispatcher::DispatchEvent(
void* browser_context_id,
const std::string& extension_id,
scoped_ptr<Event> event) {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
content::BrowserContext* context =
reinterpret_cast<content::BrowserContext*>(browser_context_id);

Powered by Google App Engine
This is Rietveld 408576698