favor DCHECK_CURRENTLY_ON for better logs in chrome/browser/android/

chrome/browser/android/bookmarks/partner_bookmarks_reader.cc

 // Copyright 2015 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/android/bookmarks/partner_bookmarks_reader.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/logging.h"
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
@@ skipping 16 matching lines @@
 using bookmarks::BookmarkNode;
 using bookmarks::BookmarkPermanentNode;
 using content::BrowserThread;
 
 namespace {
 
 void SetFaviconTask(Profile* profile,
                     const GURL& page_url, const GURL& icon_url,
                     const std::vector<unsigned char>& image_data,
                     favicon_base::IconType icon_type) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   scoped_refptr<base::RefCountedMemory> bitmap_data(
       new base::RefCountedBytes(image_data));
   gfx::Size pixel_size(gfx::kFaviconSize, gfx::kFaviconSize);
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       ProfileManager::GetActiveUserProfile(),
       ServiceAccessType::EXPLICIT_ACCESS);
   if (!favicon_service)
     return;
 
   favicon_service->MergeFavicon(
@@ skipping 60 matching lines @@
     Profile* profile)
     : partner_bookmarks_shim_(partner_bookmarks_shim),
       profile_(profile),
       wip_next_available_id_(0) {
 }
 
 PartnerBookmarksReader::~PartnerBookmarksReader() {}
 
 void PartnerBookmarksReader::PartnerBookmarksCreationComplete(JNIEnv*,
                                                               jobject) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   partner_bookmarks_shim_->SetPartnerBookmarksRoot(
       wip_partner_bookmarks_root_.release());
   wip_next_available_id_ = 0;
 }
 
 void PartnerBookmarksReader::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void PartnerBookmarksReader::Reset(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   wip_partner_bookmarks_root_.reset();
   wip_next_available_id_ = 0;
 }
 
 jlong PartnerBookmarksReader::AddPartnerBookmark(JNIEnv* env,
                                                  jobject obj,
                                                  jstring jurl,
                                                  jstring jtitle,
                                                  jboolean is_folder,
                                                  jlong parent_id,
@@ skipping 54 matching lines @@
 // ----------------------------------------------------------------
 
 static jlong Init(JNIEnv* env, jobject obj) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   PartnerBookmarksShim* partner_bookmarks_shim =
       PartnerBookmarksShim::BuildForBrowserContext(profile);
   PartnerBookmarksReader* reader = new PartnerBookmarksReader(
       partner_bookmarks_shim, profile);
   return reinterpret_cast<intptr_t>(reader);
 }