commit 00844ceac8d1850349d4ae23285c56a978a1e803
author thestig <thestig@chromium.org> Tue Sep 08 21:44:52 2015
committer Commit bot <commit-bot@chromium.org> Tue Sep 08 21:46:04 2015
tree 6201b92d86fb79c5c9bb57f3fb6c07613ed44251
parent 963891f0ae6078b07aa256c5024a618905c5d287

Use DCHECK_CURRENTLY_ON() in chrome/ and android_webview/

Review URL: https://codereview.chromium.org/1329093002

Cr-Commit-Position: refs/heads/master@{#347799}

chrome/browser/shell_integration.cc

diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index 4bf4d5b8..2ac4b58 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -180,7 +180,7 @@
 void ShellIntegration::DefaultWebClientWorker::ObserverDestroyed() {
   // Our associated view has gone away, so we shouldn't call back to it if
   // our worker thread returns after the view is dead.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   observer_ = NULL;
 }
 
@@ -188,7 +188,7 @@
 // DefaultWebClientWorker, private:
 
 void ShellIntegration::DefaultWebClientWorker::ExecuteCheckIsDefault() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   DefaultWebClientState state = CheckIsDefault();
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
@@ -198,7 +198,7 @@
 
 void ShellIntegration::DefaultWebClientWorker::CompleteCheckIsDefault(
     DefaultWebClientState state) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   UpdateUI(state);
   // The worker has finished everything it needs to do, so free the observer
   // if we own it.
@@ -210,7 +210,7 @@
 
 void ShellIntegration::DefaultWebClientWorker::ExecuteSetAsDefault(
     bool interactive_permitted) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(BrowserThread::FILE);
 
   bool result = SetAsDefault(interactive_permitted);
   BrowserThread::PostTask(
@@ -220,7 +220,7 @@
 
 void ShellIntegration::DefaultWebClientWorker::CompleteSetAsDefault(
     bool succeeded) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // First tell the observer what the SetAsDefault call has returned.
   if (observer_)
     observer_->OnSetAsDefaultConcluded(succeeded);