favor DCHECK_CURRENTLY_ON for better logs in android_webview/

android_webview/browser/icon_helper.cc

 // Copyright (c) 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 "android_webview/browser/icon_helper.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/hash.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 void IconHelper::SetListener(Listener* listener) {
   listener_ = listener;
 }
 
 void IconHelper::DownloadFaviconCallback(
     int id,
     int http_status_code,
     const GURL& image_url,
     const std::vector<SkBitmap>& bitmaps,
     const std::vector<gfx::Size>& original_bitmap_sizes) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (http_status_code == 404) {
     MarkUnableToDownloadFavicon(image_url);
     return;
   }
 
   if (bitmaps.size() == 0) {
     return;
   }
 
   // We can protentially have multiple frames of the icon
   // in different sizes. We need more fine grain API spec
   // to let clients pick out the frame they want.
 
   // TODO(acleung): Pick the best icon to return based on size.
   if (listener_)
     listener_->OnReceivedIcon(image_url, bitmaps[0]);
 }
 
 void IconHelper::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   for (std::vector<content::FaviconURL>::const_iterator i = candidates.begin();
        i != candidates.end(); ++i) {
     if (!i->icon_url.is_valid())
       continue;
 
     switch(i->icon_type) {
       case content::FaviconURL::FAVICON:
         if ((listener_ && !listener_->ShouldDownloadFavicon(i->icon_url)) ||
             WasUnableToDownloadFavicon(i->icon_url)) {
           break;
@@ skipping 38 matching lines @@
 bool IconHelper::WasUnableToDownloadFavicon(const GURL& icon_url) const {
   MissingFaviconURLHash url_hash = base::Hash(icon_url.spec());
   return missing_favicon_urls_.find(url_hash) != missing_favicon_urls_.end();
 }
 
 void IconHelper::ClearUnableToDownloadFavicons() {
   missing_favicon_urls_.clear();
 }
 
 }  // namespace android_webview