favor DCHECK_CURRENTLY_ON for better logs in content/{public,shell,test}/

content/public/test/download_test_observer.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/public/test/download_test_observer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 296 matching lines @@
     DownloadItem* download) {
   return download->GetState() == DownloadItem::INTERRUPTED;
 }
 
 DownloadTestFlushObserver::DownloadTestFlushObserver(
     DownloadManager* download_manager)
     : download_manager_(download_manager),
       waiting_for_zero_inprogress_(true) {}
 
 void DownloadTestFlushObserver::WaitForFlush() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   download_manager_->AddObserver(this);
   // The wait condition may have been met before WaitForFlush() was called.
   CheckDownloadsInProgress(true);
   BrowserThread::GetBlockingPool()->FlushForTesting();
   RunMessageLoop();
 }
 
 void DownloadTestFlushObserver::OnDownloadCreated(
     DownloadManager* manager,
     DownloadItem* item) {
@@ skipping 87 matching lines @@
     : download_id_(DownloadItem::kInvalidId),
       interrupt_reason_(DOWNLOAD_INTERRUPT_REASON_NONE),
       called_back_count_(0),
       waiting_(false) {
 }
 
 DownloadTestItemCreationObserver::~DownloadTestItemCreationObserver() {
 }
 
 void DownloadTestItemCreationObserver::WaitForDownloadItemCreation() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (called_back_count_ == 0) {
     waiting_ = true;
     RunMessageLoop();
     waiting_ = false;
   }
 }
 
 void DownloadTestItemCreationObserver::DownloadItemCreationCallback(
     DownloadItem* item,
     DownloadInterruptReason interrupt_reason) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (item)
     download_id_ = item->GetId();
   interrupt_reason_ = interrupt_reason;
   ++called_back_count_;
   DCHECK_EQ(1u, called_back_count_);
 
   if (waiting_)
     base::MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content