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

chrome/browser/safe_browsing/sandboxed_zip_analyzer.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 "chrome/browser/safe_browsing/sandboxed_zip_analyzer.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
@@ skipping 16 matching lines @@
 
 SandboxedZipAnalyzer::SandboxedZipAnalyzer(
     const base::FilePath& zip_file,
     const ResultCallback& result_callback)
     : zip_file_name_(zip_file),
       callback_(result_callback),
       callback_called_(false) {
 }
 
 void SandboxedZipAnalyzer::Start() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Starting the analyzer will block on opening the zip file, so run this
   // on a worker thread.  The task does not need to block shutdown.
   if (!BrowserThread::GetBlockingPool()->PostWorkerTaskWithShutdownBehavior(
           FROM_HERE,
           base::Bind(&SandboxedZipAnalyzer::AnalyzeInSandbox, this),
           base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN)) {
     NOTREACHED();
   }
 }
 
@@ skipping 57 matching lines @@
                         OnUtilityProcessStarted)
     IPC_MESSAGE_HANDLER(
         ChromeUtilityHostMsg_AnalyzeZipFileForDownloadProtection_Finished,
         OnAnalyzeZipFileFinished)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SandboxedZipAnalyzer::StartProcessOnIOThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   utility_process_host_ = content::UtilityProcessHost::Create(
       this,
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO).get())
       ->AsWeakPtr();
   utility_process_host_->SetName(l10n_util::GetStringUTF16(
       IDS_UTILITY_PROCESS_SAFE_BROWSING_ZIP_FILE_ANALYZER_NAME));
   utility_process_host_->Send(new ChromeUtilityMsg_StartupPing);
   // Wait for the startup notification before sending the main IPC to the
   // utility process, so that we can dup the file handle.
 }
 
 void SandboxedZipAnalyzer::OnUtilityProcessStarted() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   base::ProcessHandle utility_process =
       content::RenderProcessHost::run_renderer_in_process() ?
           base::GetCurrentProcessHandle() :
           utility_process_host_->GetData().handle;
 
   if (utility_process == base::kNullProcessHandle) {
     DLOG(ERROR) << "Child process handle is null";
   }
   utility_process_host_->Send(
       new ChromeUtilityMsg_AnalyzeZipFileForDownloadProtection(
           IPC::TakeFileHandleForProcess(zip_file_.Pass(), utility_process),
           IPC::GetFileHandleForProcess(temp_file_.GetPlatformFile(),
                                        utility_process,
                                        false /* !close_source_handle */)));
 }
 
 void SandboxedZipAnalyzer::OnAnalyzeZipFileFinished(
     const zip_analyzer::Results& results) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (callback_called_)
     return;
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(callback_, results));
   callback_called_ = true;
   CloseTemporaryFile();
 }
 
 }  // namespace safe_browsing