favor DCHECK_CURRENTLY_ON for better logs in android_webview/

BUG=466848

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

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

17 files changed, 123 insertions, 120 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index a4db9971..fd82607 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -102,7 +102,7 @@ void AwContentsMessageFilter::OnShouldOverrideUrlLoading(
     int render_frame_id,
     const base::string16& url,
     bool* ignore_navigation) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   *ignore_navigation = false;
   AwContentsClientBridgeBase* client =
       AwContentsClientBridgeBase::FromID(process_id_, render_frame_id);
diff --git a/android_webview/browser/aw_contents_client_bridge_base.cc b/android_webview/browser/aw_contents_client_bridge_base.cc
index 5dff7a7..4888a1e 100644
--- a/android_webview/browser/aw_contents_client_bridge_base.cc
+++ b/android_webview/browser/aw_contents_client_bridge_base.cc
@@ -57,7 +57,7 @@ AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromWebContents(
 AwContentsClientBridgeBase* AwContentsClientBridgeBase::FromID(
     int render_process_id,
     int render_frame_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::RenderFrameHost* rfh =
       content::RenderFrameHost::FromID(render_process_id, render_frame_id);
   content::WebContents* web_contents =
diff --git a/android_webview/browser/aw_form_database_service.cc b/android_webview/browser/aw_form_database_service.cc
index 4cdba64..b1020ba 100644
--- a/android_webview/browser/aw_form_database_service.cc
+++ b/android_webview/browser/aw_form_database_service.cc
@@ -49,7 +49,7 @@ AwFormDatabaseService::~AwFormDatabaseService() {
 }
 
 void AwFormDatabaseService::Shutdown() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(result_map_.empty());
   // TODO(sgurun) we don't run into this logic right now,
   // but if we do, then we need to implement cancellation
@@ -107,7 +107,7 @@ void AwFormDatabaseService::OnWebDataServiceRequestDone(
     WebDataServiceBase::Handle h,
     const WDTypedResult* result) {
 
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
+  DCHECK_CURRENTLY_ON(BrowserThread::DB);
   bool has_form_data = false;
   if (result) {
     DCHECK_EQ(AUTOFILL_VALUE_RESULT, result->GetType());
diff --git a/android_webview/browser/aw_login_delegate.cc b/android_webview/browser/aw_login_delegate.cc
index d388790..7ce8e70 100644
--- a/android_webview/browser/aw_login_delegate.cc
+++ b/android_webview/browser/aw_login_delegate.cc
@@ -69,21 +69,21 @@ AwLoginDelegate::~AwLoginDelegate() {
 
 void AwLoginDelegate::Proceed(const base::string16& user,
                               const base::string16& password) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&AwLoginDelegate::ProceedOnIOThread,
                  this, user, password));
 }
 
 void AwLoginDelegate::Cancel() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
       base::Bind(&AwLoginDelegate::CancelOnIOThread, this));
 }
 
 void AwLoginDelegate::HandleHttpAuthRequestOnUIThread(
     bool first_auth_attempt) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   aw_http_auth_handler_.reset(AwHttpAuthHandlerBase::Create(
       this, auth_info_.get(), first_auth_attempt));
@@ -99,7 +99,7 @@ void AwLoginDelegate::HandleHttpAuthRequestOnUIThread(
 }
 
 void AwLoginDelegate::CancelOnIOThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (request_) {
     request_->CancelAuth();
     ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_);
@@ -110,7 +110,7 @@ void AwLoginDelegate::CancelOnIOThread() {
 
 void AwLoginDelegate::ProceedOnIOThread(const base::string16& user,
                                         const base::string16& password) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (request_) {
     request_->SetAuth(net::AuthCredentials(user, password));
     ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_);
@@ -120,7 +120,7 @@ void AwLoginDelegate::ProceedOnIOThread(const base::string16& user,
 }
 
 void AwLoginDelegate::OnRequestCancelled() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   request_ = NULL;
   DeleteAuthHandlerSoon();
 }
diff --git a/android_webview/browser/aw_request_interceptor.cc b/android_webview/browser/aw_request_interceptor.cc
index 45adfb6..d486b70 100644
--- a/android_webview/browser/aw_request_interceptor.cc
+++ b/android_webview/browser/aw_request_interceptor.cc
@@ -37,7 +37,7 @@ AwRequestInterceptor::~AwRequestInterceptor() {
 scoped_ptr<AwWebResourceResponse>
 AwRequestInterceptor::QueryForAwWebResourceResponse(
     net::URLRequest* request) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   int render_process_id, render_frame_id;
   if (!ResourceRequestInfo::GetRenderFrameForRequest(
       request, &render_process_id, &render_frame_id))
@@ -55,7 +55,7 @@ AwRequestInterceptor::QueryForAwWebResourceResponse(
 net::URLRequestJob* AwRequestInterceptor::MaybeInterceptRequest(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   // See if we've already found out the aw_web_resource_response for this
   // request.
diff --git a/android_webview/browser/aw_resource_context.cc b/android_webview/browser/aw_resource_context.cc
index 6c06b6a..65682f54 100644
--- a/android_webview/browser/aw_resource_context.cc
+++ b/android_webview/browser/aw_resource_context.cc
@@ -8,6 +8,8 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 
+using content::BrowserThread;
+
 namespace android_webview {
 
 AwResourceContext::AwResourceContext(net::URLRequestContextGetter* getter)
@@ -20,7 +22,7 @@ AwResourceContext::~AwResourceContext() {
 
 void AwResourceContext::SetExtraHeaders(
     const GURL& url, const std::string& headers) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!url.is_valid()) return;
   base::AutoLock scoped_lock(extra_headers_lock_);
   if (!headers.empty())
@@ -30,7 +32,7 @@ void AwResourceContext::SetExtraHeaders(
 }
 
 std::string AwResourceContext::GetExtraHeaders(const GURL& url) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!url.is_valid()) return std::string();
   base::AutoLock scoped_lock(extra_headers_lock_);
   std::map<std::string, std::string>::iterator iter =
@@ -39,12 +41,12 @@ std::string AwResourceContext::GetExtraHeaders(const GURL& url) {
 }
 
 net::HostResolver* AwResourceContext::GetHostResolver() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return getter_->GetURLRequestContext()->host_resolver();
 }
 
 net::URLRequestContext* AwResourceContext::GetRequestContext() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   return getter_->GetURLRequestContext();
 }
 
diff --git a/android_webview/browser/icon_helper.cc b/android_webview/browser/icon_helper.cc
index 320fcd4..7ef757f 100644
--- a/android_webview/browser/icon_helper.cc
+++ b/android_webview/browser/icon_helper.cc
@@ -38,7 +38,7 @@ void IconHelper::DownloadFaviconCallback(
     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;
@@ -59,7 +59,7 @@ void IconHelper::DownloadFaviconCallback(
 
 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())
diff --git a/android_webview/browser/net/aw_network_delegate.cc b/android_webview/browser/net/aw_network_delegate.cc
index bd73247..7d55045 100644
--- a/android_webview/browser/net/aw_network_delegate.cc
+++ b/android_webview/browser/net/aw_network_delegate.cc
@@ -55,7 +55,7 @@ int AwNetworkDelegate::OnHeadersReceived(
     const net::HttpResponseHeaders* original_response_headers,
     scoped_refptr<net::HttpResponseHeaders>* override_response_headers,
     GURL* allowed_unsafe_redirect_url) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   int render_process_id, render_frame_id;
   if (original_response_headers->response_code() >= 400 &&
       content::ResourceRequestInfo::GetRenderFrameForRequest(
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index ca1c561..0d9c5fd 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -181,14 +181,14 @@ AwURLRequestContextGetter::AwURLRequestContextGetter(
       net_log_(new net::NetLog()) {
   proxy_config_service_ = config_service.Pass();
   // CreateSystemProxyConfigService for Android must be called on main thread.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 AwURLRequestContextGetter::~AwURLRequestContextGetter() {
 }
 
 void AwURLRequestContextGetter::InitializeURLRequestContext() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(!url_request_context_);
 
   net::URLRequestContextBuilder builder;
@@ -248,7 +248,7 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
 }
 
 net::URLRequestContext* AwURLRequestContextGetter::GetURLRequestContext() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (!url_request_context_)
     InitializeURLRequestContext();
 
diff --git a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
index dfa4aa2..14be49b 100644
--- a/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
+++ b/android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.cc
@@ -93,7 +93,7 @@ IoThreadClientThrottle::IoThreadClientThrottle(int render_process_id,
       request_(request) { }
 
 IoThreadClientThrottle::~IoThreadClientThrottle() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   g_webview_resource_dispatcher_host_delegate.Get().
       RemovePendingThrottleOnIoThread(this);
 }
@@ -103,7 +103,7 @@ const char* IoThreadClientThrottle::GetNameForLogging() const {
 }
 
 void IoThreadClientThrottle::WillStartRequest(bool* defer) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (render_frame_id_ < 1)
     return;
   DCHECK(render_process_id_);
@@ -130,7 +130,7 @@ void IoThreadClientThrottle::WillRedirectRequest(
 
 void IoThreadClientThrottle::OnIoThreadClientReady(int new_render_process_id,
                                                    int new_render_frame_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (!MaybeBlockRequest()) {
     controller()->Resume();
@@ -353,7 +353,7 @@ void AwResourceDispatcherHostDelegate::OnResponseStarted(
 
 void AwResourceDispatcherHostDelegate::RemovePendingThrottleOnIoThread(
     IoThreadClientThrottle* throttle) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   PendingThrottleMap::iterator it = pending_throttles_.find(
       FrameRouteIDPair(throttle->render_process_id(),
                        throttle->render_frame_id()));
@@ -391,7 +391,7 @@ void AwResourceDispatcherHostDelegate::AddPendingThrottleOnIoThread(
     int render_process_id,
     int render_frame_id_id,
     IoThreadClientThrottle* pending_throttle) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   pending_throttles_.insert(
       std::pair<FrameRouteIDPair, IoThreadClientThrottle*>(
           FrameRouteIDPair(render_process_id, render_frame_id_id),
@@ -401,7 +401,7 @@ void AwResourceDispatcherHostDelegate::AddPendingThrottleOnIoThread(
 void AwResourceDispatcherHostDelegate::OnIoThreadClientReadyInternal(
     int new_render_process_id,
     int new_render_frame_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   PendingThrottleMap::iterator it = pending_throttles_.find(
       FrameRouteIDPair(new_render_process_id, new_render_frame_id));
 
diff --git a/android_webview/browser/renderer_host/print_manager.cc b/android_webview/browser/renderer_host/print_manager.cc
index ba29619..56a96f0 100644
--- a/android_webview/browser/renderer_host/print_manager.cc
+++ b/android_webview/browser/renderer_host/print_manager.cc
@@ -91,7 +91,7 @@ void PrintManager::OnDidGetDocumentCookie(int cookie) {
 
 void PrintManager::OnGetDefaultPrintSettings(IPC::Message* reply_msg) {
   // Unlike the printing_message_filter, we do process this in ui thread
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   OnGetDefaultPrintSettingsReply(reply_msg);
 }
 
@@ -142,7 +142,7 @@ void PrintManager::OnPrintingFailed(int cookie) {
 }
 
 bool PrintManager::PrintNow() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (printing_)
     return false;
 
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index d2433d9..ea07c75 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -139,7 +139,7 @@ void OnIoThreadClientReady(content::RenderFrameHost* rfh) {
 
 // static
 AwContents* AwContents::FromWebContents(WebContents* web_contents) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return AwContentsUserData::GetContents(web_contents);
 }
 
@@ -196,7 +196,7 @@ void AwContents::SetJavaPeers(JNIEnv* env,
                               jobject contents_client_bridge,
                               jobject io_thread_client,
                               jobject intercept_navigation_delegate) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // The |aw_content| param is technically spurious as it duplicates |obj| but
   // is passed over anyway to make the binding more explicit.
   java_ref_ = JavaObjectWeakGlobalRef(env, aw_contents);
@@ -223,7 +223,7 @@ void AwContents::SetJavaPeers(JNIEnv* env,
 }
 
 void AwContents::SetSaveFormData(bool enabled) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   InitAutofillIfNecessary(enabled);
   // We need to check for the existence, since autofill_manager_delegate
   // may not be created when the setting is false.
@@ -258,7 +258,7 @@ void AwContents::InitAutofillIfNecessary(bool enabled) {
 }
 
 void AwContents::SetAwAutofillClient(jobject client) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -287,7 +287,7 @@ AwContents::~AwContents() {
 
 base::android::ScopedJavaLocalRef<jobject>
 AwContents::GetWebContents(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(web_contents_);
   if (!web_contents_)
     return base::android::ScopedJavaLocalRef<jobject>();
@@ -330,7 +330,7 @@ jint GetNativeInstanceCount(JNIEnv* env, jclass) {
 }
 
 jlong AwContents::GetAwDrawGLViewContext(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return reinterpret_cast<intptr_t>(
       browser_view_renderer_.GetAwDrawGLViewContext());
 }
@@ -345,7 +345,7 @@ void DocumentHasImagesCallback(const ScopedJavaGlobalRef<jobject>& message,
 }  // namespace
 
 void AwContents::DocumentHasImages(JNIEnv* env, jobject obj, jobject message) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ScopedJavaGlobalRef<jobject> j_message;
   j_message.Reset(env, message);
   render_view_host_ext_->DocumentHasImages(
@@ -366,7 +366,7 @@ void GenerateMHTMLCallback(ScopedJavaGlobalRef<jobject>* callback,
 
 void AwContents::GenerateMHTML(JNIEnv* env, jobject obj,
                                jstring jpath, jobject callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, callback);
   base::FilePath target_path(ConvertJavaStringToUTF8(env, jpath));
@@ -387,7 +387,7 @@ void AwContents::CreatePdfExporter(JNIEnv* env,
 bool AwContents::OnReceivedHttpAuthRequest(const JavaRef<jobject>& handler,
                                            const std::string& host,
                                            const std::string& realm) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -403,14 +403,14 @@ bool AwContents::OnReceivedHttpAuthRequest(const JavaRef<jobject>& handler,
 }
 
 void AwContents::SetOffscreenPreRaster(bool enabled) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.SetOffscreenPreRaster(enabled);
 }
 
 void AwContents::AddVisitedLinks(JNIEnv* env,
                                    jobject obj,
                                    jobjectArray jvisited_links) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::vector<base::string16> visited_link_strings;
   base::android::AppendJavaStringArrayToStringVector(
       env, jvisited_links, &visited_link_strings);
@@ -464,7 +464,7 @@ void ShowGeolocationPromptHelper(const JavaObjectWeakGlobalRef& java_ref,
 
 void AwContents::ShowGeolocationPrompt(const GURL& requesting_frame,
                                        base::Callback<void(bool)> callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   GURL origin = requesting_frame.GetOrigin();
   bool show_prompt = pending_geolocation_prompts_.empty();
@@ -479,7 +479,7 @@ void AwContents::InvokeGeolocationCallback(JNIEnv* env,
                                            jobject obj,
                                            jboolean value,
                                            jstring origin) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   GURL callback_origin(base::android::ConvertJavaStringToUTF16(env, origin));
   if (callback_origin.GetOrigin() ==
@@ -494,7 +494,7 @@ void AwContents::InvokeGeolocationCallback(JNIEnv* env,
 }
 
 void AwContents::HideGeolocationPrompt(const GURL& origin) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   bool removed_current_outstanding_callback = false;
   std::list<OriginCallback>::iterator it = pending_geolocation_prompts_.begin();
   while (it != pending_geolocation_prompts_.end()) {
@@ -602,17 +602,17 @@ void AwContents::CancelGeolocationPermissionRequests(const GURL& origin) {
 }
 
 void AwContents::FindAllAsync(JNIEnv* env, jobject obj, jstring search_string) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GetFindHelper()->FindAllAsync(ConvertJavaStringToUTF16(env, search_string));
 }
 
 void AwContents::FindNext(JNIEnv* env, jobject obj, jboolean forward) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GetFindHelper()->FindNext(forward);
 }
 
 void AwContents::ClearMatches(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GetFindHelper()->ClearMatches();
 }
 
@@ -620,7 +620,7 @@ void AwContents::ClearCache(
     JNIEnv* env,
     jobject obj,
     jboolean include_disk_files) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   render_view_host_ext_->ClearCache();
 
   if (include_disk_files) {
@@ -630,7 +630,7 @@ void AwContents::ClearCache(
 }
 
 FindHelper* AwContents::GetFindHelper() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!find_helper_.get()) {
     find_helper_.reset(new FindHelper(web_contents_.get()));
     find_helper_->SetListener(this);
@@ -641,7 +641,7 @@ FindHelper* AwContents::GetFindHelper() {
 void AwContents::OnFindResultReceived(int active_ordinal,
                                       int match_count,
                                       bool finished) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -656,7 +656,7 @@ bool AwContents::ShouldDownloadFavicon(const GURL& icon_url) {
 }
 
 void AwContents::OnReceivedIcon(const GURL& icon_url, const SkBitmap& bitmap) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -677,7 +677,7 @@ void AwContents::OnReceivedIcon(const GURL& icon_url, const SkBitmap& bitmap) {
 
 void AwContents::OnReceivedTouchIconUrl(const std::string& url,
                                         bool precomposed) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -688,7 +688,7 @@ void AwContents::OnReceivedTouchIconUrl(const std::string& url,
 }
 
 bool AwContents::RequestDrawGL(bool wait_for_completion) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -697,7 +697,7 @@ bool AwContents::RequestDrawGL(bool wait_for_completion) {
 }
 
 void AwContents::PostInvalidate() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null())
@@ -705,7 +705,7 @@ void AwContents::PostInvalidate() {
 }
 
 void AwContents::OnNewPicture() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (!obj.is_null()) {
@@ -718,7 +718,7 @@ void AwContents::OnNewPicture() {
 base::android::ScopedJavaLocalRef<jbyteArray>
     AwContents::GetCertificate(JNIEnv* env,
                                jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::NavigationEntry* entry =
       web_contents_->GetController().GetActiveEntry();
   if (!entry)
@@ -742,14 +742,14 @@ void AwContents::RequestNewHitTestDataAt(JNIEnv* env,
                                          jfloat x,
                                          jfloat y,
                                          jfloat touch_major) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   gfx::PointF touch_center(x, y);
   gfx::SizeF touch_area(touch_major, touch_major);
   render_view_host_ext_->RequestNewHitTestDataAt(touch_center, touch_area);
 }
 
 void AwContents::UpdateLastHitTestData(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!render_view_host_ext_->HasNewHitTestData()) return;
 
   const AwHitTestData& data = render_view_host_ext_->GetLastHitTestData();
@@ -784,22 +784,22 @@ void AwContents::UpdateLastHitTestData(JNIEnv* env, jobject obj) {
 
 void AwContents::OnSizeChanged(JNIEnv* env, jobject obj,
                                int w, int h, int ow, int oh) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.OnSizeChanged(w, h);
 }
 
 void AwContents::SetViewVisibility(JNIEnv* env, jobject obj, bool visible) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.SetViewVisibility(visible);
 }
 
 void AwContents::SetWindowVisibility(JNIEnv* env, jobject obj, bool visible) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.SetWindowVisibility(visible);
 }
 
 void AwContents::SetIsPaused(JNIEnv* env, jobject obj, bool paused) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.SetIsPaused(paused);
   ContentViewCore* cvc =
       ContentViewCore::FromWebContents(web_contents_.get());
@@ -809,12 +809,12 @@ void AwContents::SetIsPaused(JNIEnv* env, jobject obj, bool paused) {
 }
 
 void AwContents::OnAttachedToWindow(JNIEnv* env, jobject obj, int w, int h) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.OnAttachedToWindow(w, h);
 }
 
 void AwContents::OnDetachedFromWindow(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.OnDetachedFromWindow();
 }
 
@@ -827,7 +827,7 @@ void AwContents::DetachFunctorFromView() {
 
 base::android::ScopedJavaLocalRef<jbyteArray>
 AwContents::GetOpaqueState(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Required optimization in WebViewClassic to not save any state if
   // there has been no navigations.
   if (!web_contents_->GetController().GetEntryCount())
@@ -844,7 +844,7 @@ AwContents::GetOpaqueState(JNIEnv* env, jobject obj) {
 
 jboolean AwContents::RestoreFromOpaqueState(
     JNIEnv* env, jobject obj, jbyteArray state) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // TODO(boliu): This copy can be optimized out if this is a performance
   // problem.
   std::vector<uint8> state_vector;
@@ -867,7 +867,7 @@ bool AwContents::OnDraw(JNIEnv* env,
                         jint visible_top,
                         jint visible_right,
                         jint visible_bottom) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   gfx::Vector2d scroll(scroll_x, scroll_y);
   browser_view_renderer_.PrepareToDraw(
       scroll, gfx::Rect(visible_left, visible_top, visible_right - visible_left,
@@ -900,7 +900,7 @@ bool AwContents::OnDraw(JNIEnv* env,
 
 void AwContents::SetPendingWebContentsForPopup(
     scoped_ptr<content::WebContents> pending) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (pending_contents_.get()) {
     // TODO(benm): Support holding multiple pop up window requests.
     LOG(WARNING) << "Blocking popup window creation as an outstanding "
@@ -912,22 +912,22 @@ void AwContents::SetPendingWebContentsForPopup(
 }
 
 void AwContents::FocusFirstNode(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   web_contents_->FocusThroughTabTraversal(false);
 }
 
 void AwContents::SetBackgroundColor(JNIEnv* env, jobject obj, jint color) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   render_view_host_ext_->SetBackgroundColor(color);
 }
 
 jlong AwContents::ReleasePopupAwContents(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return reinterpret_cast<intptr_t>(pending_contents_.release());
 }
 
 gfx::Point AwContents::GetLocationOnScreen() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -941,7 +941,7 @@ gfx::Point AwContents::GetLocationOnScreen() {
 }
 
 void AwContents::ScrollContainerViewTo(gfx::Vector2d new_value) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -951,7 +951,7 @@ void AwContents::ScrollContainerViewTo(gfx::Vector2d new_value) {
 }
 
 bool AwContents::IsFlingActive() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -964,7 +964,7 @@ void AwContents::UpdateScrollState(gfx::Vector2d max_scroll_offset,
                                    float page_scale_factor,
                                    float min_page_scale_factor,
                                    float max_page_scale_factor) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -981,7 +981,7 @@ void AwContents::UpdateScrollState(gfx::Vector2d max_scroll_offset,
 }
 
 void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -991,17 +991,17 @@ void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
 }
 
 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.SetDipScale(dip_scale);
 }
 
 void AwContents::ScrollTo(JNIEnv* env, jobject obj, jint x, jint y) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.ScrollTo(gfx::Vector2d(x, y));
 }
 
 void AwContents::OnWebLayoutPageScaleFactorChanged(float page_scale_factor) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -1012,7 +1012,7 @@ void AwContents::OnWebLayoutPageScaleFactorChanged(float page_scale_factor) {
 
 void AwContents::OnWebLayoutContentsSizeChanged(
     const gfx::Size& contents_size) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -1025,7 +1025,7 @@ jlong AwContents::CapturePicture(JNIEnv* env,
                                  jobject obj,
                                  int width,
                                  int height) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return reinterpret_cast<intptr_t>(
       new AwPicture(browser_view_renderer_.CapturePicture(width, height)));
 }
@@ -1033,7 +1033,7 @@ jlong AwContents::CapturePicture(JNIEnv* env,
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.EnableOnNewPicture(enabled);
 }
 
@@ -1053,7 +1053,7 @@ void InvokeVisualStateCallback(const JavaObjectWeakGlobalRef& java_ref,
 
 void AwContents::InsertVisualStateCallback(
     JNIEnv* env, jobject obj, long request_id, jobject callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ScopedJavaGlobalRef<jobject>* j_callback = new ScopedJavaGlobalRef<jobject>();
   j_callback->Reset(env, callback);
   web_contents_->GetMainFrame()->InsertVisualStateCallback(
@@ -1062,7 +1062,7 @@ void AwContents::InsertVisualStateCallback(
 }
 
 void AwContents::ClearView(JNIEnv* env, jobject obj) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.ClearView();
 }
 
@@ -1081,7 +1081,7 @@ void AwContents::SetExtraHeadersForUrl(JNIEnv* env, jobject obj,
 void AwContents::SetJsOnlineProperty(JNIEnv* env,
                                      jobject obj,
                                      jboolean network_up) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   render_view_host_ext_->SetJsOnlineProperty(network_up);
 }
 
@@ -1089,7 +1089,7 @@ void AwContents::TrimMemory(JNIEnv* env,
                             jobject obj,
                             jint level,
                             jboolean visible) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_view_renderer_.TrimMemory(level, visible);
 }
 
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index c54b8a1..b7de4cb 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -272,7 +272,7 @@ void AwContentsClientBridge::RunJavaScriptDialog(
     const base::string16& message_text,
     const base::string16& default_prompt_text,
     const content::JavaScriptDialogManager::DialogClosedCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
@@ -322,7 +322,7 @@ void AwContentsClientBridge::RunBeforeUnloadDialog(
     const GURL& origin_url,
     const base::string16& message_text,
     const content::JavaScriptDialogManager::DialogClosedCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
 
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
@@ -361,7 +361,7 @@ void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
                                              jobject,
                                              int id,
                                              jstring prompt) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
   if (!callback) {
@@ -377,7 +377,7 @@ void AwContentsClientBridge::ConfirmJsResult(JNIEnv* env,
 }
 
 void AwContentsClientBridge::CancelJsResult(JNIEnv*, jobject, int id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   content::JavaScriptDialogManager::DialogClosedCallback* callback =
       pending_js_dialog_callbacks_.Lookup(id);
   if (!callback) {
diff --git a/android_webview/native/aw_contents_io_thread_client_impl.cc b/android_webview/native/aw_contents_io_thread_client_impl.cc
index 419631e..11ac6f0 100644
--- a/android_webview/native/aw_contents_io_thread_client_impl.cc
+++ b/android_webview/native/aw_contents_io_thread_client_impl.cc
@@ -257,7 +257,7 @@ bool AwContentsIoThreadClientImpl::PendingAssociation() const {
 
 AwContentsIoThreadClient::CacheMode
 AwContentsIoThreadClientImpl::GetCacheMode() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return AwContentsIoThreadClient::LOAD_DEFAULT;
 
@@ -270,7 +270,7 @@ AwContentsIoThreadClientImpl::GetCacheMode() const {
 scoped_ptr<AwWebResourceResponse>
 AwContentsIoThreadClientImpl::ShouldInterceptRequest(
     const net::URLRequest* request) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return scoped_ptr<AwWebResourceResponse>();
 
@@ -296,7 +296,7 @@ AwContentsIoThreadClientImpl::ShouldInterceptRequest(
 }
 
 bool AwContentsIoThreadClientImpl::ShouldBlockContentUrls() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
@@ -306,7 +306,7 @@ bool AwContentsIoThreadClientImpl::ShouldBlockContentUrls() const {
 }
 
 bool AwContentsIoThreadClientImpl::ShouldBlockFileUrls() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
@@ -316,7 +316,7 @@ bool AwContentsIoThreadClientImpl::ShouldBlockFileUrls() const {
 }
 
 bool AwContentsIoThreadClientImpl::ShouldAcceptThirdPartyCookies() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
@@ -326,7 +326,7 @@ bool AwContentsIoThreadClientImpl::ShouldAcceptThirdPartyCookies() const {
 }
 
 bool AwContentsIoThreadClientImpl::ShouldBlockNetworkLoads() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return false;
 
@@ -341,7 +341,7 @@ void AwContentsIoThreadClientImpl::NewDownload(
     const string& content_disposition,
     const string& mime_type,
     int64 content_length) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return;
 
@@ -368,7 +368,7 @@ void AwContentsIoThreadClientImpl::NewDownload(
 void AwContentsIoThreadClientImpl::NewLoginRequest(const string& realm,
                                                    const string& account,
                                                    const string& args) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return;
 
@@ -413,7 +413,7 @@ void AwContentsIoThreadClientImpl::OnReceivedError(
 void AwContentsIoThreadClientImpl::OnReceivedHttpError(
     const net::URLRequest* request,
     const net::HttpResponseHeaders* response_headers) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (java_object_.is_null())
     return;
 
diff --git a/android_webview/native/aw_http_auth_handler.cc b/android_webview/native/aw_http_auth_handler.cc
index 0c4fd92..700270a 100644
--- a/android_webview/native/aw_http_auth_handler.cc
+++ b/android_webview/native/aw_http_auth_handler.cc
@@ -14,6 +14,7 @@
 #include "content/public/browser/web_contents.h"
 
 using base::android::ConvertJavaStringToUTF16;
+using content::BrowserThread;
 
 namespace android_webview {
 
@@ -23,7 +24,7 @@ AwHttpAuthHandler::AwHttpAuthHandler(AwLoginDelegate* login_delegate,
     : login_delegate_(login_delegate),
       host_(auth_info->challenger.host()),
       realm_(auth_info->realm) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = base::android::AttachCurrentThread();
   http_auth_handler_.Reset(
       Java_AwHttpAuthHandler_create(
@@ -31,7 +32,7 @@ AwHttpAuthHandler::AwHttpAuthHandler(AwLoginDelegate* login_delegate,
 }
 
 AwHttpAuthHandler:: ~AwHttpAuthHandler() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   Java_AwHttpAuthHandler_handlerDestroyed(base::android::AttachCurrentThread(),
                                           http_auth_handler_.obj());
 }
@@ -40,7 +41,7 @@ void AwHttpAuthHandler::Proceed(JNIEnv* env,
                                 jobject obj,
                                 jstring user,
                                 jstring password) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (login_delegate_.get()) {
     login_delegate_->Proceed(ConvertJavaStringToUTF16(env, user),
                              ConvertJavaStringToUTF16(env, password));
@@ -49,7 +50,7 @@ void AwHttpAuthHandler::Proceed(JNIEnv* env,
 }
 
 void AwHttpAuthHandler::Cancel(JNIEnv* env, jobject obj) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (login_delegate_.get()) {
     login_delegate_->Cancel();
     login_delegate_ = NULL;
@@ -58,7 +59,7 @@ void AwHttpAuthHandler::Cancel(JNIEnv* env, jobject obj) {
 
 bool AwHttpAuthHandler::HandleOnUIThread(content::WebContents* web_contents) {
   DCHECK(web_contents);
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   AwContents* aw_contents = AwContents::FromWebContents(web_contents);
 
   return aw_contents->OnReceivedHttpAuthRequest(http_auth_handler_, host_,
diff --git a/android_webview/native/aw_pdf_exporter.cc b/android_webview/native/aw_pdf_exporter.cc
index fc679f3..1cb35ca 100644
--- a/android_webview/native/aw_pdf_exporter.cc
+++ b/android_webview/native/aw_pdf_exporter.cc
@@ -45,7 +45,7 @@ void AwPdfExporter::ExportToPdf(JNIEnv* env,
                                 jobject obj,
                                 int fd,
                                 jobject cancel_signal) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   CreatePdfSettings(env, obj);
   PrintManager* print_manager =
       PrintManager::CreateForWebContents(
diff --git a/android_webview/native/aw_quota_manager_bridge_impl.cc b/android_webview/native/aw_quota_manager_bridge_impl.cc
index 9ec1b6b..1f01530 100644
--- a/android_webview/native/aw_quota_manager_bridge_impl.cc
+++ b/android_webview/native/aw_quota_manager_bridge_impl.cc
@@ -74,13 +74,13 @@ GetOriginsTask::GetOriginsTask(
     QuotaManager* quota_manager)
     : ui_callback_(callback),
       quota_manager_(quota_manager) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 GetOriginsTask::~GetOriginsTask() {}
 
 void GetOriginsTask::Run() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
@@ -93,7 +93,7 @@ void GetOriginsTask::Run() {
 
 void GetOriginsTask::OnOriginsObtained(const std::set<GURL>& origins,
                                        storage::StorageType type) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   num_callbacks_to_wait_ = origins.size();
   num_callbacks_received_ = 0u;
 
@@ -114,7 +114,7 @@ void GetOriginsTask::OnUsageAndQuotaObtained(
     storage::QuotaStatusCode status_code,
     int64 usage,
     int64 quota) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (status_code == storage::kQuotaStatusOk) {
     origin_.push_back(origin.spec());
     usage_.push_back(usage);
@@ -126,7 +126,7 @@ void GetOriginsTask::OnUsageAndQuotaObtained(
 }
 
 void GetOriginsTask::CheckDone() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (num_callbacks_received_ == num_callbacks_to_wait_) {
     BrowserThread::PostTask(
         BrowserThread::UI,
@@ -139,7 +139,7 @@ void GetOriginsTask::CheckDone() {
 
 // This method is to avoid copying the 3 vector arguments into a bound callback.
 void GetOriginsTask::DoneOnUIThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   ui_callback_.Run(origin_, usage_, quota_);
 }
 
@@ -184,7 +184,7 @@ void AwQuotaManagerBridgeImpl::Init(JNIEnv* env, jobject object) {
 }
 
 StoragePartition* AwQuotaManagerBridgeImpl::GetStoragePartition() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // AndroidWebview does not use per-site storage partitions.
   StoragePartition* storage_partition =
@@ -194,7 +194,7 @@ StoragePartition* AwQuotaManagerBridgeImpl::GetStoragePartition() const {
 }
 
 QuotaManager* AwQuotaManagerBridgeImpl::GetQuotaManager() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   QuotaManager* quota_manager = GetStoragePartition()->GetQuotaManager();
   DCHECK(quota_manager);
@@ -207,7 +207,7 @@ void AwQuotaManagerBridgeImpl::DeleteAllData(JNIEnv* env, jobject object) {
 }
 
 void AwQuotaManagerBridgeImpl::DeleteAllDataOnUiThread() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   GetStoragePartition()->ClearData(
       // Clear all web storage data except cookies.
       StoragePartition::REMOVE_DATA_MASK_APPCACHE |
@@ -231,7 +231,7 @@ void AwQuotaManagerBridgeImpl::DeleteOrigin(
 
 void AwQuotaManagerBridgeImpl::DeleteOriginOnUiThread(
     const base::string16& origin) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   StoragePartition* storage_partition = GetStoragePartition();
   storage_partition->ClearDataForOrigin(
       // All (temporary) QuotaClient types.
@@ -253,7 +253,7 @@ void AwQuotaManagerBridgeImpl::GetOrigins(
 }
 
 void AwQuotaManagerBridgeImpl::GetOriginsOnUiThread(jint callback_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   const GetOriginsCallback ui_callback = base::Bind(
       &AwQuotaManagerBridgeImpl::GetOriginsCallbackImpl,
@@ -268,7 +268,7 @@ void AwQuotaManagerBridgeImpl::GetOriginsCallbackImpl(
     const std::vector<std::string>& origin,
     const std::vector<int64>& usage,
     const std::vector<int64>& quota) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
@@ -290,7 +290,7 @@ void OnUsageAndQuotaObtained(
     storage::QuotaStatusCode status_code,
     int64 usage,
     int64 quota) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (status_code != storage::kQuotaStatusOk) {
     usage = 0;
     quota = 0;
@@ -322,7 +322,7 @@ void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread(
     const base::string16& origin,
     jint callback_id,
     bool is_quota) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   const QuotaUsageCallback ui_callback = base::Bind(
       &AwQuotaManagerBridgeImpl::QuotaUsageCallbackImpl,
       weak_factory_.GetWeakPtr(),
@@ -341,7 +341,7 @@ void AwQuotaManagerBridgeImpl::GetUsageAndQuotaForOriginOnUiThread(
 
 void AwQuotaManagerBridgeImpl::QuotaUsageCallbackImpl(
     int jcallback_id, bool is_quota, int64 usage, int64 quota) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())