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

chrome/browser/android/most_visited_sites.cc

 // Copyright 2013 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/most_visited_sites.h"
 
 #include <string>
 #include <vector>
 
 #include "base/android/jni_android.h"
@@ skipping 84 matching lines @@
 
 SkBitmap ExtractThumbnail(const base::RefCountedMemory& image_data) {
   scoped_ptr<SkBitmap> image(gfx::JPEGCodec::Decode(
       image_data.front(),
       image_data.size()));
   return image.get() ? *image : SkBitmap();
 }
 
 void AddForcedURLOnUIThread(scoped_refptr<history::TopSites> top_sites,
                             const GURL& url) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   top_sites->AddForcedURL(url, base::Time::Now());
 }
 
 // Runs on the DB thread.
 void GetUrlThumbnailTask(
     std::string url_string,
     scoped_refptr<TopSites> top_sites,
     ScopedJavaGlobalRef<jobject>* j_callback,
     MostVisitedSites::LookupSuccessCallback lookup_success_ui_callback,
     base::Closure lookup_failed_ui_callback) {
@@ skipping 121 matching lines @@
     // TopSites changes.
     scoped_observer_.Add(top_sites.get());
   }
 }
 
 // Called from the UI Thread.
 void MostVisitedSites::GetURLThumbnail(JNIEnv* env,
                                        jobject obj,
                                        jstring url,
                                        jobject j_callback_obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ScopedJavaGlobalRef<jobject>* j_callback =
       new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, j_callback_obj);
 
   std::string url_string = ConvertJavaStringToUTF8(env, url);
   scoped_refptr<TopSites> top_sites(TopSitesFactory::GetForProfile(profile_));
 
   // If the Suggestions service is enabled and in use, create a callback to
   // fetch a server thumbnail from it, in case the local thumbnail is not found.
   SuggestionsService* suggestions_service =
@@ skipping 183 matching lines @@
   Java_MostVisitedURLsObserver_onMostVisitedURLsAvailable(
       env,
       j_observer->obj(),
       ToJavaArrayOfStrings(env, titles).obj(),
       ToJavaArrayOfStrings(env, urls).obj());
 }
 
 void MostVisitedSites::OnObtainedThumbnail(
     ScopedJavaGlobalRef<jobject>* bitmap,
     ScopedJavaGlobalRef<jobject>* j_callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   if (bitmap->obj()) {
     num_local_thumbs_++;
   } else {
     num_empty_thumbs_++;
   }
   Java_ThumbnailCallback_onMostVisitedURLsThumbnailAvailable(
       env, j_callback->obj(), bitmap->obj());
 }
 
 void MostVisitedSites::GetSuggestionsThumbnailOnUIThread(
     SuggestionsService* suggestions_service,
     const std::string& url_string,
     ScopedJavaGlobalRef<jobject>* j_callback) {
   suggestions_service->GetPageThumbnail(
       GURL(url_string),
       base::Bind(&MostVisitedSites::OnSuggestionsThumbnailAvailable,
                  weak_ptr_factory_.GetWeakPtr(),
                  base::Owned(new ScopedJavaGlobalRef<jobject>(*j_callback))));
 }
 
 void MostVisitedSites::OnSuggestionsThumbnailAvailable(
     ScopedJavaGlobalRef<jobject>* j_callback,
     const GURL& url,
     const SkBitmap* bitmap) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaGlobalRef<jobject>* j_bitmap_ref =
       new ScopedJavaGlobalRef<jobject>();
   if (bitmap) {
     num_server_thumbs_++;
     j_bitmap_ref->Reset(
         env,
         gfx::ConvertToJavaBitmap(bitmap).obj());
   } else {
@@ skipping 22 matching lines @@
     // The displayed suggestions are invalidated.
     QueryMostVisitedURLs();
   }
 }
 
 static jlong Init(JNIEnv* env, jobject obj, jobject jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }