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

extensions/browser/api/sockets_tcp/tcp_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/tcp_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 14 matching lines @@
 
 // static
 BrowserContextKeyedAPIFactory<TCPSocketEventDispatcher>*
 TCPSocketEventDispatcher::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 // static
 TCPSocketEventDispatcher* TCPSocketEventDispatcher::Get(
     content::BrowserContext* context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   return BrowserContextKeyedAPIFactory<TCPSocketEventDispatcher>::Get(context);
 }
 
 TCPSocketEventDispatcher::TCPSocketEventDispatcher(
     content::BrowserContext* context)
     : thread_id_(Socket::kThreadId), browser_context_(context) {
   ApiResourceManager<ResumableTCPSocket>* manager =
       ApiResourceManager<ResumableTCPSocket>::Get(browser_context_);
   DCHECK(manager)
       << "There is no socket manager. "
          "If this assertion is failing during a test, then it is likely that "
          "TestExtensionSystem is failing to provide an instance of "
          "ApiResourceManager<ResumableTCPSocket>.";
   sockets_ = manager->data_;
 }
 
 TCPSocketEventDispatcher::~TCPSocketEventDispatcher() {}
 
 TCPSocketEventDispatcher::ReadParams::ReadParams() {}
 
 TCPSocketEventDispatcher::ReadParams::~ReadParams() {}
 
 void TCPSocketEventDispatcher::OnSocketConnect(const std::string& extension_id,
                                                int socket_id) {
-  DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+  DCHECK_CURRENTLY_ON(thread_id_);
 
   StartSocketRead(extension_id, socket_id);
 }
 
 void TCPSocketEventDispatcher::OnSocketResume(const std::string& extension_id,
                                               int socket_id) {
-  DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+  DCHECK_CURRENTLY_ON(thread_id_);
 
   StartSocketRead(extension_id, socket_id);
 }
 
 void TCPSocketEventDispatcher::StartSocketRead(const std::string& extension_id,
                                                int socket_id) {
-  DCHECK(BrowserThread::CurrentlyOn(thread_id_));
+  DCHECK_CURRENTLY_ON(thread_id_);
 
   ReadParams params;
   params.thread_id = thread_id_;
   params.browser_context_id = browser_context_;
   params.extension_id = extension_id;
   params.sockets = sockets_;
   params.socket_id = socket_id;
 
   StartRead(params);
 }
 
 // static
 void TCPSocketEventDispatcher::StartRead(const ReadParams& params) {
-  DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+  DCHECK_CURRENTLY_ON(params.thread_id);
 
   ResumableTCPSocket* socket =
       params.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 read if the socket has been paused.
   if (socket->paused())
     return;
 
   int buffer_size = socket->buffer_size();
   if (buffer_size <= 0)
     buffer_size = kDefaultBufferSize;
   socket->Read(buffer_size,
                base::Bind(&TCPSocketEventDispatcher::ReadCallback, params));
 }
 
 // static
 void TCPSocketEventDispatcher::ReadCallback(
     const ReadParams& params,
     int bytes_read,
     scoped_refptr<net::IOBuffer> io_buffer) {
-  DCHECK(BrowserThread::CurrentlyOn(params.thread_id));
+  DCHECK_CURRENTLY_ON(params.thread_id);
 
   // If |bytes_read| == 0, the connection has been closed by the peer.
   // If |bytes_read| < 0, there was a network error, and |bytes_read| is a value
   // from "net::ERR_".
 
   if (bytes_read == 0) {
     bytes_read = net::ERR_CONNECTION_CLOSED;
   }
 
   if (bytes_read > 0) {
@@ skipping 34 matching lines @@
         params.sockets->Get(params.extension_id, params.socket_id);
     if (socket) {
       socket->set_paused(true);
     }
   }
 }
 
 // static
 void TCPSocketEventDispatcher::PostEvent(const ReadParams& 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 TCPSocketEventDispatcher::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