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

content/shell/browser/shell_download_manager_delegate.cc

 // Copyright 2013 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/shell/browser/shell_download_manager_delegate.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <commdlg.h>
 #endif
@@ skipping 41 matching lines @@
 void ShellDownloadManagerDelegate::Shutdown() {
   // Revoke any pending callbacks. download_manager_ et. al. are no longer safe
   // to access after this point.
   weak_ptr_factory_.InvalidateWeakPtrs();
   download_manager_ = NULL;
 }
 
 bool ShellDownloadManagerDelegate::DetermineDownloadTarget(
     DownloadItem* download,
     const DownloadTargetCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // This assignment needs to be here because even at the call to
   // SetDownloadManager, the system is not fully initialized.
   if (default_download_path_.empty()) {
     default_download_path_ = download_manager_->GetBrowserContext()->GetPath().
         Append(FILE_PATH_LITERAL("Downloads"));
   }
 
   if (!download->GetForcedFilePath().empty()) {
     callback.Run(download->GetForcedFilePath(),
                  DownloadItem::TARGET_DISPOSITION_OVERWRITE,
@@ skipping 34 matching lines @@
 }
 
 // static
 void ShellDownloadManagerDelegate::GenerateFilename(
     const GURL& url,
     const std::string& content_disposition,
     const std::string& suggested_filename,
     const std::string& mime_type,
     const base::FilePath& suggested_directory,
     const FilenameDeterminedCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   base::FilePath generated_name = net::GenerateFileName(url,
                                                         content_disposition,
                                                         std::string(),
                                                         suggested_filename,
                                                         mime_type,
                                                         "download");
 
   if (!base::PathExists(suggested_directory))
     base::CreateDirectory(suggested_directory);
 
   base::FilePath suggested_path(suggested_directory.Append(generated_name));
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(callback, suggested_path));
 }
 
 void ShellDownloadManagerDelegate::OnDownloadPathGenerated(
     uint32 download_id,
     const DownloadTargetCallback& callback,
     const base::FilePath& suggested_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (suppress_prompting_) {
     // Testing exit.
     callback.Run(suggested_path, DownloadItem::TARGET_DISPOSITION_OVERWRITE,
                  DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
                  suggested_path.AddExtension(FILE_PATH_LITERAL(".crdownload")));
     return;
   }
 
   ChooseDownloadPath(download_id, callback, suggested_path);
 }
 
 void ShellDownloadManagerDelegate::ChooseDownloadPath(
     uint32 download_id,
     const DownloadTargetCallback& callback,
     const base::FilePath& suggested_path) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DownloadItem* item = download_manager_->GetDownload(download_id);
   if (!item || (item->GetState() != DownloadItem::IN_PROGRESS))
     return;
 
   base::FilePath result;
 #if defined(OS_WIN)
   std::wstring file_part = base::FilePath(suggested_path).BaseName().value();
   wchar_t file_name[MAX_PATH];
   base::wcslcpy(file_name, file_part.c_str(), arraysize(file_name));
   OPENFILENAME save_as;
@@ skipping 22 matching lines @@
                DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, result);
 }
 
 void ShellDownloadManagerDelegate::SetDownloadBehaviorForTesting(
     const base::FilePath& default_download_path) {
   default_download_path_ = default_download_path;
   suppress_prompting_ = true;
 }
 
 }  // namespace content