[chrome/browser/download] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/download/download_history_unittest.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 <vector>
 
 #include "base/memory/weak_ptr.h"
 #include "base/rand_util.h"
 #include "base/stl_util.h"
 #include "chrome/browser/download/download_history.h"
@@ skipping 57 matching lines @@
   FakeHistoryAdapter()
     : DownloadHistory::HistoryAdapter(NULL),
       slow_create_download_(false),
       fail_create_download_(false) {
   }
 
   ~FakeHistoryAdapter() override {}
 
   void QueryDownloads(
       const history::HistoryService::DownloadQueryCallback& callback) override {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
         base::Bind(&FakeHistoryAdapter::QueryDownloadsDone,
             base::Unretained(this), callback));
   }
 
   void QueryDownloadsDone(
       const history::HistoryService::DownloadQueryCallback& callback) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     CHECK(expect_query_downloads_.get());
     callback.Run(expect_query_downloads_.Pass());
   }
 
   void set_slow_create_download(bool slow) { slow_create_download_ = slow; }
 
   void CreateDownload(const history::DownloadRow& info,
                       const history::HistoryService::DownloadCreateCallback&
                           callback) override {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     create_download_info_ = info;
     // Must not call CreateDownload() again before FinishCreateDownload()!
     DCHECK(create_download_callback_.is_null());
     create_download_callback_ = base::Bind(callback, !fail_create_download_);
     fail_create_download_ = false;
     if (!slow_create_download_)
       FinishCreateDownload();
   }
 
   void FinishCreateDownload() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     create_download_callback_.Run();
     create_download_callback_.Reset();
   }
 
   void UpdateDownload(const history::DownloadRow& info) override {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     update_download_ = info;
   }
 
   void RemoveDownloads(const IdSet& ids) override {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     for (IdSet::const_iterator it = ids.begin();
          it != ids.end(); ++it) {
       remove_downloads_.insert(*it);
     }
   }
 
   void ExpectWillQueryDownloads(scoped_ptr<InfoVector> infos) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     expect_query_downloads_ = infos.Pass();
   }
 
   void ExpectQueryDownloadsDone() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     EXPECT_TRUE(NULL == expect_query_downloads_.get());
   }
 
   void FailCreateDownload() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     fail_create_download_ = true;
   }
 
   void ExpectDownloadCreated(
       const history::DownloadRow& info) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     CheckInfoEqual(info, create_download_info_);
     create_download_info_ = history::DownloadRow();
   }
 
   void ExpectNoDownloadCreated() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     CheckInfoEqual(history::DownloadRow(), create_download_info_);
   }
 
   void ExpectDownloadUpdated(const history::DownloadRow& info) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     CheckInfoEqual(update_download_, info);
     update_download_ = history::DownloadRow();
   }
 
   void ExpectNoDownloadUpdated() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     CheckInfoEqual(history::DownloadRow(), update_download_);
   }
 
   void ExpectNoDownloadsRemoved() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     EXPECT_EQ(0, static_cast<int>(remove_downloads_.size()));
   }
 
   void ExpectDownloadsRemoved(const IdSet& ids) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     IdSet differences = base::STLSetDifference<IdSet>(ids, remove_downloads_);
     for (IdSet::const_iterator different = differences.begin();
          different != differences.end(); ++different) {
       EXPECT_TRUE(false) << *different;
     }
     remove_downloads_.clear();
   }
 
  private:
@@ skipping 30 matching lines @@
 
   void SetManagerObserver(
       content::DownloadManager::Observer* manager_observer) {
     manager_observer_ = manager_observer;
   }
   content::DownloadManager::Observer* manager_observer() {
     return manager_observer_;
   }
 
   void CreateDownloadHistory(scoped_ptr<InfoVector> infos) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     CHECK(infos.get());
     EXPECT_CALL(manager(), AddObserver(_)).WillOnce(WithArg<0>(Invoke(
         this, &DownloadHistoryTest::SetManagerObserver)));
     EXPECT_CALL(manager(), RemoveObserver(_));
     download_created_index_ = 0;
     for (size_t index = 0; index < infos->size(); ++index) {
       const history::DownloadRow& row = infos->at(index);
       content::MockDownloadManager::CreateDownloadItemAdapter adapter(
           history::ToContentDownloadId(row.id),
           row.current_path,
@@ skipping 22 matching lines @@
     history_ = new FakeHistoryAdapter();
     history_->ExpectWillQueryDownloads(infos.Pass());
     EXPECT_CALL(*manager_.get(), GetAllDownloads(_)).WillRepeatedly(Return());
     download_history_.reset(new DownloadHistory(
         &manager(), scoped_ptr<DownloadHistory::HistoryAdapter>(history_)));
     content::RunAllPendingInMessageLoop(content::BrowserThread::UI);
     history_->ExpectQueryDownloadsDone();
   }
 
   void CallOnDownloadCreated(size_t index) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     if (!pre_on_create_handler_.is_null())
       pre_on_create_handler_.Run(&item(index));
     manager_observer()->OnDownloadCreated(&manager(), &item(index));
     if (!post_on_create_handler_.is_null())
       post_on_create_handler_.Run(&item(index));
   }
 
   void CallOnDownloadCreatedInOrder() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     // Gmock doesn't appear to support something like InvokeWithTheseArgs. Maybe
     // gmock needs to learn about base::Callback.
     CallOnDownloadCreated(download_created_index_++);
   }
 
   void set_slow_create_download(bool slow) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->set_slow_create_download(slow);
   }
 
   void FinishCreateDownload() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->FinishCreateDownload();
   }
 
   void FailCreateDownload() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->FailCreateDownload();
   }
 
   void ExpectDownloadCreated(
       const history::DownloadRow& info) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->ExpectDownloadCreated(info);
   }
 
   void ExpectNoDownloadCreated() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->ExpectNoDownloadCreated();
   }
 
   void ExpectDownloadUpdated(const history::DownloadRow& info) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->ExpectDownloadUpdated(info);
   }
 
   void ExpectNoDownloadUpdated() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->ExpectNoDownloadUpdated();
   }
 
   void ExpectNoDownloadsRemoved() {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->ExpectNoDownloadsRemoved();
   }
 
   void ExpectDownloadsRemoved(const IdSet& ids) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     history_->ExpectDownloadsRemoved(ids);
   }
 
   void ExpectDownloadsRestoredFromHistory(bool expected_value) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
     pre_on_create_handler_ =
         base::Bind(&DownloadHistoryTest::CheckDownloadWasRestoredFromHistory,
                    base::Unretained(this),
                    expected_value);
     post_on_create_handler_ =
         base::Bind(&DownloadHistoryTest::CheckDownloadWasRestoredFromHistory,
                    base::Unretained(this),
                    expected_value);
   }
 
@@ skipping 41 matching lines @@
       const std::string& last_modified,
       int64 received_bytes,
       int64 total_bytes,
       content::DownloadItem::DownloadState state,
       content::DownloadDangerType danger_type,
       content::DownloadInterruptReason interrupt_reason,
       bool opened,
       const std::string& by_extension_id,
       const std::string& by_extension_name,
       history::DownloadRow* info) {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
     size_t index = items_.size();
     StrictMockDownloadItem* mock_item = new StrictMockDownloadItem();
     items_.push_back(mock_item);
 
     info->current_path = current_path;
     info->target_path = target_path;
     info->url_chain = url_chain;
     info->referrer_url = referrer;
     info->mime_type = mime_type;
@@ skipping 458 matching lines @@
   FinishCreateDownload();
   EXPECT_TRUE(DownloadHistory::IsPersisted(&item(0)));
 
   // ItemAdded should call OnDownloadUpdated, which should detect that the item
   // changed while it was being added and call UpdateDownload immediately.
   info.opened = true;
   ExpectDownloadUpdated(info);
 }
 
 }  // anonymous namespace