Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions.

extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.h"
 
 #include "extensions/browser/api/socket/tcp_socket.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
@@ skipping 10 matching lines @@
 
 // static
 BrowserContextKeyedAPIFactory<TCPServerSocketEventDispatcher>*
 TCPServerSocketEventDispatcher::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 // static
 TCPServerSocketEventDispatcher* TCPServerSocketEventDispatcher::Get(
     content::BrowserContext* context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   return BrowserContextKeyedAPIFactory<TCPServerSocketEventDispatcher>::Get(
       context);
 }
 
 TCPServerSocketEventDispatcher::TCPServerSocketEventDispatcher(
     content::BrowserContext* context)
     : thread_id_(Socket::kThreadId), browser_context_(context) {
   ApiResourceManager<ResumableTCPServerSocket>* server_manager =
       ApiResourceManager<ResumableTCPServerSocket>::Get(browser_context_);
@@ skipping 16 matching lines @@
 
 TCPServerSocketEventDispatcher::~TCPServerSocketEventDispatcher() {}
 
 TCPServerSocketEventDispatcher::AcceptParams::AcceptParams() {}
 
 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);
 }
 
 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);
 }
 
 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_;
   params.browser_context_id = browser_context_;
   params.extension_id = extension_id;
   params.server_sockets = server_sockets_;
   params.client_sockets = client_sockets_;
   params.socket_id = socket_id;
 
   StartAccept(params);
 }
 
 // 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);
   if (!socket) {
     // This can happen if the socket is closed while our callback is active.
     return;
   }
   DCHECK(params.extension_id == socket->owner_extension_id())
       << "Socket has wrong owner.";
 
   // Don't start another accept if the socket has been paused.
   if (socket->paused())
     return;
 
   socket->Accept(
       base::Bind(&TCPServerSocketEventDispatcher::AcceptCallback, params));
 }
 
 // static
 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 =
         new ResumableTCPSocket(socket, params.extension_id, true);
     client_socket->set_paused(true);
     int client_socket_id = params.client_sockets->Add(client_socket);
 
     // Dispatch "onAccept" event.
     sockets_tcp_server::AcceptInfo accept_info;
     accept_info.socket_id = params.socket_id;
@@ skipping 28 matching lines @@
         params.server_sockets->Get(params.extension_id, params.socket_id);
     if (socket) {
       socket->set_paused(true);
     }
   }
 }
 
 // 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,
                           base::Bind(&DispatchEvent,
                                      params.browser_context_id,
                                      params.extension_id,
                                      base::Passed(event.Pass())));
 }
 
 // static
 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);
   if (!extensions::ExtensionsBrowserClient::Get()->IsValidContext(context))
     return;
   EventRouter* router = ExtensionSystem::Get(context)->event_router();
   if (router)
     router->DispatchEventToExtension(extension_id, event.Pass());
 }
 
 }  // namespace core_api
 }  // namespace extensions