favor DCHECK_CURRENTLY_ON for better logs in content/browser/[q-z]*

content/browser/ssl/ssl_error_handler.cc

 // Copyright (c) 2012 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 "content/browser/ssl/ssl_error_handler.h"
 
 #include "base/bind.h"
 #include "content/browser/frame_host/navigation_controller_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/ssl/ssl_cert_error_handler.h"
@@ skipping 38 matching lines @@
 
 void SSLErrorHandler::OnDispatched() {
   TakeNoAction();
 }
 
 SSLCertErrorHandler* SSLErrorHandler::AsSSLCertErrorHandler() {
   return NULL;
 }
 
 void SSLErrorHandler::Dispatch() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   WebContents* web_contents = NULL;
   RenderFrameHost* render_frame_host =
       RenderFrameHost::FromID(render_process_id_, render_frame_id_);
   web_contents = WebContents::FromRenderFrameHost(render_frame_host);
 
   if (!web_contents) {
     // We arrived on the UI thread, but the tab we're looking for is no longer
     // here.
     OnDispatchFailed();
     return;
   }
 
   // Hand ourselves off to the SSLManager.
   manager_ =
       static_cast<NavigationControllerImpl*>(&web_contents->GetController())->
           ssl_manager();
   OnDispatched();
 }
 
 void SSLErrorHandler::CancelRequest() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &SSLErrorHandler::CompleteCancelRequest, this, net::ERR_ABORTED));
 }
 
 void SSLErrorHandler::DenyRequest() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &SSLErrorHandler::CompleteCancelRequest, this,
           net::ERR_INSECURE_RESPONSE));
 }
 
 void SSLErrorHandler::ContinueRequest() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SSLErrorHandler::CompleteContinueRequest, this));
 }
 
 void SSLErrorHandler::TakeNoAction() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // We need to complete this task on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SSLErrorHandler::CompleteTakeNoAction, this));
 }
 
 void SSLErrorHandler::CompleteCancelRequest(int error) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // It is important that we notify the net::URLRequest only once.  If we try
   // to notify the request twice, it may no longer exist and |this| might have
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
   if (request_has_been_notified_)
     return;
 
   SSLCertErrorHandler* cert_error = AsSSLCertErrorHandler();
   const SSLInfo* ssl_info = NULL;
   if (cert_error)
     ssl_info = &cert_error->ssl_info();
   if (delegate_.get())
     delegate_->CancelSSLRequest(error, ssl_info);
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }
 
 void SSLErrorHandler::CompleteContinueRequest() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // It is important that we notify the net::URLRequest only once. If we try to
   // notify the request twice, it may no longer exist and |this| might have
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
   if (request_has_been_notified_)
     return;
 
   if (delegate_.get())
     delegate_->ContinueSSLRequest();
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }
 
 void SSLErrorHandler::CompleteTakeNoAction() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // It is important that we notify the net::URLRequest only once. If we try to
   // notify the request twice, it may no longer exist and |this| might have
   // already have been deleted.
   DCHECK(!request_has_been_notified_);
   if (request_has_been_notified_)
     return;
 
   request_has_been_notified_ = true;
 
   // We're done with this object on the IO thread.
   Release();
 }
 
 }  // namespace content