favor DCHECK_CURRENTLY_ON for better logs in content/{public,shell,test}/

content/public/browser/push_messaging_service.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 "content/public/browser/push_messaging_service.h"
 
 #include "base/callback.h"
 #include "content/browser/push_messaging/push_messaging_message_filter.h"
 #include "content/browser/service_worker/service_worker_context_wrapper.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 53 matching lines @@
   service_worker_context_wrapper->context()->storage()->StoreUserData(
       service_worker_registration_id, origin,
       kNotificationsShownServiceWorkerKey, data,
       base::Bind(&CallResultCallbackFromIO, callback));
 }
 
 void ClearPushRegistrationIDOnIO(
     scoped_refptr<ServiceWorkerContextWrapper> service_worker_context,
     int64 service_worker_registration_id,
     const base::Closure& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   service_worker_context->context()->storage()->ClearUserData(
       service_worker_registration_id,
       kPushRegistrationIdServiceWorkerKey,
       base::Bind(&CallClosureFromIO, callback));
 }
 
 scoped_refptr<ServiceWorkerContextWrapper> GetServiceWorkerContext(
     BrowserContext* browser_context, const GURL& origin) {
   StoragePartition* partition =
@@ skipping 38 matching lines @@
                                      origin,
                                      notifications_shown,
                                      callback));
 }
 
 // static
 void PushMessagingService::GetSenderId(BrowserContext* browser_context,
                                        const GURL& origin,
                                        int64 service_worker_registration_id,
                                        const StringCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&GetUserDataOnIO,
                  GetServiceWorkerContext(browser_context, origin),
                  service_worker_registration_id,
                  kPushSenderIdServiceWorkerKey,
                  callback));
 }
 
 // static
 void PushMessagingService::ClearPushRegistrationID(
     BrowserContext* browser_context,
     const GURL& origin,
     int64 service_worker_registration_id,
     const base::Closure& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&ClearPushRegistrationIDOnIO,
                  GetServiceWorkerContext(browser_context, origin),
                  service_worker_registration_id,
                  callback));
 }
 
 }  // namespace content