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

content/public/test/test_file_error_injector.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/test_file_error_injector.h"
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 112 matching lines @@
   // one (as happens during download resumption), then the DestructionCallback
   // for the old DownloadFile is run before the ConstructionCallback for the
   // next DownloadFile.
   BrowserThread::PostTask(
       BrowserThread::FILE,
       FROM_HERE,
       base::Bind(ctor_callback, source_url_));
 }
 
 DownloadFileWithErrors::~DownloadFileWithErrors() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   destruction_callback_.Run(source_url_);
 }
 
 void DownloadFileWithErrors::Initialize(
     const InitializeCallback& callback) {
   DownloadInterruptReason error_to_return = DOWNLOAD_INTERRUPT_REASON_NONE;
   InitializeCallback callback_to_use = callback;
 
   // Replace callback if the error needs to be overwritten.
   if (OverwriteError(
@@ skipping 210 matching lines @@
       created_factory_);
 
   download_manager_->SetDownloadFileFactoryForTesting(
       download_file_factory.Pass());
 }
 
 TestFileErrorInjector::~TestFileErrorInjector() {
 }
 
 bool TestFileErrorInjector::AddError(const FileErrorInfo& error_info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK_LE(0, error_info.operation_instance);
   DCHECK(injected_errors_.find(error_info.url) == injected_errors_.end());
 
   // Creates an empty entry if necessary.
   injected_errors_[error_info.url] = error_info;
 
   return true;
 }
 
 void TestFileErrorInjector::ClearErrors() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   injected_errors_.clear();
 }
 
 bool TestFileErrorInjector::InjectErrors() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   ClearFoundFiles();
 
   DCHECK_EQ(static_cast<DownloadFileFactory*>(created_factory_),
             download_manager_->GetDownloadFileFactoryForTesting());
 
   created_factory_->ClearErrors();
 
   for (ErrorMap::const_iterator it = injected_errors_.begin();
        it != injected_errors_.end(); ++it)
     created_factory_->AddError(it->second);
 
   return true;
 }
 
 size_t TestFileErrorInjector::CurrentFileCount() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return files_.size();
 }
 
 size_t TestFileErrorInjector::TotalFileCount() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return found_files_.size();
 }
 
 
 bool TestFileErrorInjector::HadFile(const GURL& url) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   return (found_files_.find(url) != found_files_.end());
 }
 
 void TestFileErrorInjector::ClearFoundFiles() {
   found_files_.clear();
 }
 
 void TestFileErrorInjector::DownloadFileCreated(GURL url) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(files_.find(url) == files_.end());
 
   files_.insert(url);
   found_files_.insert(url);
 }
 
 void TestFileErrorInjector::DestroyingDownloadFile(GURL url) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(files_.find(url) != files_.end());
 
   files_.erase(url);
 }
 
 void TestFileErrorInjector::RecordDownloadFileConstruction(const GURL& url) {
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&TestFileErrorInjector::DownloadFileCreated, this, url));
@@ skipping 29 matching lines @@
     case FILE_OPERATION_RENAME_ANNOTATE:
       return "RENAME_ANNOTATE";
     default:
       break;
   }
 
   return "Unknown";
 }
 
 }  // namespace content