favor DCHECK_CURRENTLY_ON for better logs in content/browser/[a-d]*

content/browser/download/drag_download_file.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/download/drag_download_file.h"
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "base/message_loop/message_loop.h"
 #include "content/browser/download/download_stats.h"
@@ skipping 37 matching lines @@
         weak_ptr_factory_(this) {
     DCHECK(on_completed_loop_);
     DCHECK(!on_completed_.is_null());
     DCHECK(web_contents_);
     // May be called on any thread.
     // Do not call weak_ptr_factory_.GetWeakPtr() outside the UI thread.
   }
 
   void InitiateDownload(base::File file,
                         const base::FilePath& file_path) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DownloadManager* download_manager =
         BrowserContext::GetDownloadManager(web_contents_->GetBrowserContext());
 
     RecordDownloadSource(INITIATED_BY_DRAG_N_DROP);
     scoped_ptr<content::DownloadUrlParameters> params(
         DownloadUrlParameters::FromWebContents(web_contents_, url_));
     params->set_referrer(referrer_);
     params->set_referrer_encoding(referrer_encoding_);
     params->set_callback(base::Bind(&DragDownloadFileUI::OnDownloadStarted,
                                     weak_ptr_factory_.GetWeakPtr()));
     params->set_file_path(file_path);
     params->set_file(file.Pass());  // Nulls file.
     download_manager->DownloadUrl(params.Pass());
   }
 
   void Cancel() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (download_item_)
       download_item_->Cancel(true);
   }
 
   void Delete() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     delete this;
   }
 
  private:
   ~DragDownloadFileUI() override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (download_item_)
       download_item_->RemoveObserver(this);
   }
 
   void OnDownloadStarted(DownloadItem* item,
                          DownloadInterruptReason interrupt_reason) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (!item) {
       DCHECK_NE(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason);
       on_completed_loop_->PostTask(FROM_HERE, base::Bind(on_completed_, false));
       return;
     }
     DCHECK_EQ(DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason);
     download_item_ = item;
     download_item_->AddObserver(this);
   }
 
   // DownloadItem::Observer:
   void OnDownloadUpdated(DownloadItem* item) override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK_EQ(download_item_, item);
     DownloadItem::DownloadState state = download_item_->GetState();
     if (state == DownloadItem::COMPLETE ||
         state == DownloadItem::CANCELLED ||
         state == DownloadItem::INTERRUPTED) {
       if (!on_completed_.is_null()) {
         on_completed_loop_->PostTask(FROM_HERE, base::Bind(
             on_completed_, state == DownloadItem::COMPLETE));
         on_completed_.Reset();
       }
       download_item_->RemoveObserver(this);
       download_item_ = NULL;
     }
     // Ignore other states.
   }
 
   void OnDownloadDestroyed(DownloadItem* item) override {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK_EQ(download_item_, item);
     if (!on_completed_.is_null()) {
       const bool is_complete =
           download_item_->GetState() == DownloadItem::COMPLETE;
       on_completed_loop_->PostTask(FROM_HERE, base::Bind(
           on_completed_, is_complete));
       on_completed_.Reset();
     }
     download_item_->RemoveObserver(this);
     download_item_ = NULL;
@@ skipping 93 matching lines @@
   observer_ = NULL;
 
   if (nested_loop_.running())
     nested_loop_.Quit();
 }
 
 void DragDownloadFile::CheckThread() {
 #if defined(OS_WIN)
   DCHECK(drag_message_loop_ == base::MessageLoop::current());
 #else
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 #endif
 }
 
 }  // namespace content