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/certificate_manager_model.cc

diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index e932883..81803ea 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -52,7 +52,7 @@
     content::BrowserContext* browser_context,
     CertificateManagerModel::Observer* observer,
     const CreationCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
@@ -71,7 +71,7 @@
       is_user_db_available_(is_user_db_available),
       is_tpm_available_(is_tpm_available),
       observer_(observer) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 CertificateManagerModel::~CertificateManagerModel() {
@@ -213,7 +213,7 @@
     bool is_tpm_available,
     CertificateManagerModel::Observer* observer,
     const CreationCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   scoped_ptr<CertificateManagerModel> model(new CertificateManagerModel(
       cert_db, is_user_db_available, is_tpm_available, observer));
@@ -225,7 +225,7 @@
     CertificateManagerModel::Observer* observer,
     const CreationCallback& callback,
     net::NSSCertDatabase* cert_db) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   bool is_user_db_available = cert_db->GetPublicSlot();
   bool is_tpm_available = false;
@@ -248,7 +248,7 @@
     content::ResourceContext* context,
     CertificateManagerModel::Observer* observer,
     const CreationCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   net::NSSCertDatabase* cert_db = GetNSSCertDatabaseForResourceContext(
       context,
       base::Bind(&CertificateManagerModel::DidGetCertDBOnIOThread,