favor DCHECK_CURRENTLY_ON for better logs in content/browser/[a-d]*

content/browser/android/download_controller_android_impl.cc

 // Copyright (c) 2012 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 "content/browser/android/download_controller_android_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 80 matching lines @@
       iter != deferred_downloads_.end(); ++iter) {
     if (*iter == observer) {
       deferred_downloads_.erase(iter);
       return;
     }
   }
 }
 
 void DownloadControllerAndroidImpl::CreateGETDownload(
     int render_process_id, int render_view_id, int request_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   GlobalRequestID global_id(render_process_id, request_id);
 
   // We are yielding the UI thread and render_view_host may go away by
   // the time we come back. Pass along render_process_id and render_view_id
   // to retrieve it later (if it still exists).
   GetDownloadInfoCB cb = base::Bind(
         &DownloadControllerAndroidImpl::StartAndroidDownload,
         base::Unretained(this), render_process_id,
         render_view_id);
 
   PrepareDownloadInfo(
       global_id,
       base::Bind(&DownloadControllerAndroidImpl::StartDownloadOnUIThread,
                  base::Unretained(this), cb));
 }
 
 void DownloadControllerAndroidImpl::PrepareDownloadInfo(
     const GlobalRequestID& global_id,
     const GetDownloadInfoCB& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   net::URLRequest* request =
       ResourceDispatcherHostImpl::Get()->GetURLRequest(global_id);
   if (!request) {
     LOG(ERROR) << "Request to download not found.";
     return;
   }
 
   DownloadInfoAndroid info_android(request);
 
@@ skipping 11 matching lines @@
     }
   } else {
     // Can't get any cookies, start android download.
     callback.Run(info_android);
   }
 }
 
 void DownloadControllerAndroidImpl::CheckPolicyAndLoadCookies(
     const DownloadInfoAndroid& info, const GetDownloadInfoCB& callback,
     const GlobalRequestID& global_id, const net::CookieList& cookie_list) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   net::URLRequest* request =
       ResourceDispatcherHostImpl::Get()->GetURLRequest(global_id);
   if (!request) {
     LOG(ERROR) << "Request to download not found.";
     return;
   }
 
   if (request->context()->network_delegate()->CanGetCookies(
       *request, cookie_list)) {
     DoLoadCookies(info, callback, global_id);
   } else {
     callback.Run(info);
   }
 }
 
 void DownloadControllerAndroidImpl::DoLoadCookies(
     const DownloadInfoAndroid& info, const GetDownloadInfoCB& callback,
     const GlobalRequestID& global_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   net::CookieOptions options;
   options.set_include_httponly();
 
   net::URLRequest* request =
       ResourceDispatcherHostImpl::Get()->GetURLRequest(global_id);
   if (!request) {
     LOG(ERROR) << "Request to download not found.";
     return;
   }
@@ skipping 10 matching lines @@
     const std::string& cookie) {
   download_info.cookie = cookie;
 
   // We have everything we need, start Android download.
   callback.Run(download_info);
 }
 
 void DownloadControllerAndroidImpl::StartDownloadOnUIThread(
     const GetDownloadInfoCB& callback,
     const DownloadInfoAndroid& info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, base::Bind(callback, info));
 }
 
 void DownloadControllerAndroidImpl::StartAndroidDownload(
     int render_process_id, int render_view_id,
     const DownloadInfoAndroid& info) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // Call newHttpGetDownload
   WebContents* web_contents = GetWebContents(render_process_id, render_view_id);
   if (!web_contents) {
     // The view went away. Can't proceed.
     LOG(ERROR) << "Download failed on URL:" << info.url.spec();
     return;
   }
   ScopedJavaLocalRef<jobject> view =
@@ skipping 30 matching lines @@
 
   Java_DownloadController_newHttpGetDownload(
       env, GetJavaObject()->Controller(env).obj(), view.obj(), jurl.obj(),
       juser_agent.obj(), jcontent_disposition.obj(), jmime_type.obj(),
       jcookie.obj(), jreferer.obj(), info.has_user_gesture, jfilename.obj(),
       info.total_bytes);
 }
 
 void DownloadControllerAndroidImpl::OnDownloadStarted(
     DownloadItem* download_item) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!download_item->GetWebContents())
     return;
 
   JNIEnv* env = base::android::AttachCurrentThread();
 
   // Register for updates to the DownloadItem.
   download_item->AddObserver(this);
 
   ScopedJavaLocalRef<jobject> view =
       GetContentViewCoreFromWebContents(download_item->GetWebContents());
   // The view went away. Can't proceed.
   if (view.is_null())
     return;
 
   ScopedJavaLocalRef<jstring> jmime_type =
       ConvertUTF8ToJavaString(env, download_item->GetMimeType());
   ScopedJavaLocalRef<jstring> jfilename = ConvertUTF8ToJavaString(
       env, download_item->GetTargetFilePath().BaseName().value());
   Java_DownloadController_onDownloadStarted(
       env, GetJavaObject()->Controller(env).obj(), view.obj(), jfilename.obj(),
       jmime_type.obj());
 }
 
 void DownloadControllerAndroidImpl::OnDownloadUpdated(DownloadItem* item) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (item->IsDangerous() && (item->GetState() != DownloadItem::CANCELLED))
     OnDangerousDownload(item);
 
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jstring> jurl =
       ConvertUTF8ToJavaString(env, item->GetURL().spec());
   ScopedJavaLocalRef<jstring> jmime_type =
       ConvertUTF8ToJavaString(env, item->GetMimeType());
   ScopedJavaLocalRef<jstring> jpath =
       ConvertUTF8ToJavaString(env, item->GetTargetFilePath().value());
@@ skipping 146 matching lines @@
 
   const content::ResourceRequestInfo* info =
       content::ResourceRequestInfo::ForRequest(request);
   if (info)
     has_user_gesture = info->HasUserGesture();
 }
 
 DownloadControllerAndroidImpl::DownloadInfoAndroid::~DownloadInfoAndroid() {}
 
 }  // namespace content