favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/e*-i*

BUG=466848

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

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

8 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc
index c783f9c..1d8c566 100644
--- a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc
+++ b/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.cc
@@ -89,7 +89,7 @@ void BookmarkImageServiceAndroid::RetrieveSalientImageFromContext(
     content::RenderFrameHost* render_frame_host,
     const GURL& page_url,
     bool update_bookmark) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (IsPageUrlInProgress(page_url))
     return;  // A request for this URL is already in progress.
 
@@ -259,7 +259,7 @@ void BookmarkImageServiceAndroid::BitmapFetcherHandler::Start(
 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete(
     const GURL& url,
     const SkBitmap* bitmap) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   scoped_ptr<gfx::Image> image;
   if (bitmap) {
diff --git a/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc b/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
index 6cd7c65..96c2f5b 100644
--- a/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
+++ b/chrome/browser/enhanced_bookmarks/android/enhanced_bookmarks_bridge.cc
@@ -213,7 +213,7 @@ void EnhancedBookmarksBridge::MoveBookmark(JNIEnv* env,
                                            jobject obj,
                                            jobject j_bookmark_id_obj,
                                            jobject j_parent_id_obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(enhanced_bookmark_model_->loaded());
 
   long bookmark_id = JavaBookmarkIdGetId(env, j_bookmark_id_obj);
diff --git a/chrome/browser/feedback/feedback_profile_observer.cc b/chrome/browser/feedback/feedback_profile_observer.cc
index 63d5ac7..90415a8 100644
--- a/chrome/browser/feedback/feedback_profile_observer.cc
+++ b/chrome/browser/feedback/feedback_profile_observer.cc
@@ -39,7 +39,7 @@ void FeedbackProfileObserver::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK_EQ(chrome::NOTIFICATION_PROFILE_CREATED, type);
 
   Profile* profile = content::Source<Profile>(source).ptr();
diff --git a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index c9025969..9b54b99 100644
--- a/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -42,7 +42,7 @@ ChromeInternalLogSource::~ChromeInternalLogSource() {
 }
 
 void ChromeInternalLogSource::Fetch(const SysLogsSourceCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   SystemLogsResponse response;
diff --git a/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.cc b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.cc
index c44ce22..39ca766 100644
--- a/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.cc
+++ b/chrome/browser/feedback/system_logs/log_sources/memory_details_log_source.cc
@@ -18,7 +18,7 @@ class SystemLogsMemoryHandler : public MemoryDetails {
   // Sends the data to the callback.
   // MemoryDetails override.
   void OnDetailsAvailable() override {
-    DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
     scoped_ptr<SystemLogsResponse> response(new SystemLogsResponse);
     (*response)["mem_usage"] = ToLogString();
@@ -40,7 +40,7 @@ MemoryDetailsLogSource::~MemoryDetailsLogSource() {
 }
 
 void MemoryDetailsLogSource::Fetch(const SysLogsSourceCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   scoped_refptr<SystemLogsMemoryHandler>
diff --git a/chrome/browser/feedback/system_logs/system_logs_fetcher_base.cc b/chrome/browser/feedback/system_logs/system_logs_fetcher_base.cc
index 6974cf0..7a0b938 100644
--- a/chrome/browser/feedback/system_logs/system_logs_fetcher_base.cc
+++ b/chrome/browser/feedback/system_logs/system_logs_fetcher_base.cc
@@ -27,7 +27,7 @@ SystemLogsFetcherBase::SystemLogsFetcherBase()
 SystemLogsFetcherBase::~SystemLogsFetcherBase() {}
 
 void SystemLogsFetcherBase::Fetch(const SysLogsFetcherCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(callback_.is_null());
   DCHECK(!callback.is_null());
 
@@ -42,7 +42,7 @@ void SystemLogsFetcherBase::Fetch(const SysLogsFetcherCallback& callback) {
 
 void SystemLogsFetcherBase::AddResponse(const std::string& source_name,
                                         SystemLogsResponse* response) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   VLOG(1) << "Received SystemLogSource: " << source_name;
 
diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc
index b0f521b..01cf53b 100644
--- a/chrome/browser/geolocation/chrome_access_token_store.cc
+++ b/chrome/browser/geolocation/chrome_access_token_store.cc
@@ -59,7 +59,7 @@ class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
   ~TokenLoadingJob() {}
 
   void PerformWorkOnUIThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DictionaryPrefUpdate update(g_browser_process->local_state(),
                                 prefs::kGeolocationAccessToken);
     base::DictionaryValue* token_dictionary = update.Get();
@@ -114,7 +114,7 @@ ChromeAccessTokenStore::~ChromeAccessTokenStore() {}
 
 static void SetAccessTokenOnUIThread(const GURL& server_url,
                                      const base::string16& token) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DictionaryPrefUpdate update(g_browser_process->local_state(),
                               prefs::kGeolocationAccessToken);
   base::DictionaryValue* access_token_dictionary = update.Get();
diff --git a/chrome/browser/importer/external_process_importer_host.cc b/chrome/browser/importer/external_process_importer_host.cc
index 4700e4b..5f8cfc9 100644
--- a/chrome/browser/importer/external_process_importer_host.cc
+++ b/chrome/browser/importer/external_process_importer_host.cc
@@ -84,7 +84,7 @@ void ExternalProcessImporterHost::NotifyImportItemEnded(
 }
 
 void ExternalProcessImporterHost::NotifyImportEnded() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   firefox_lock_.reset();
   if (observer_)
     observer_->ImportEnded();