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

chrome/browser/chromeos/login/signin/merge_session_throttle.cc

 // Copyright 2014 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/chromeos/login/signin/merge_session_throttle.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/singleton.h"
@@ skipping 59 matching lines @@
 
 base::AtomicRefCount MergeSessionThrottle::all_profiles_restored_(0);
 
 MergeSessionThrottle::MergeSessionThrottle(net::URLRequest* request,
                                            ResourceType resource_type)
     : request_(request),
       resource_type_(resource_type) {
 }
 
 MergeSessionThrottle::~MergeSessionThrottle() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
 
 void MergeSessionThrottle::WillStartRequest(bool* defer) {
   if (!ShouldDelayUrl(request_->url()))
     return;
 
   DVLOG(1) << "WillStartRequest: defer " << request_->url();
   const content::ResourceRequestInfo* info =
     content::ResourceRequestInfo::ForRequest(request_);
   BrowserThread::PostTask(
@@ skipping 14 matching lines @@
 const char* MergeSessionThrottle::GetNameForLogging() const {
   return "MergeSessionThrottle";
 }
 
 // static.
 bool MergeSessionThrottle::AreAllSessionMergedAlready() {
   return !base::AtomicRefCountIsZero(&all_profiles_restored_);
 }
 
 void MergeSessionThrottle::OnBlockingPageComplete() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
   controller()->Resume();
 }
 
 bool MergeSessionThrottle::ShouldDelayUrl(const GURL& url) const {
   // If we are loading google properties while merge session is in progress,
   // we will show delayed loading page instead.
   return !net::NetworkChangeNotifier::IsOffline() &&
          !AreAllSessionMergedAlready() &&
          google_util::IsGoogleHostname(url.host(),
                                        google_util::ALLOW_SUBDOMAIN);
@@ skipping 27 matching lines @@
   if (ProfileSet::Get()->size() == 0) {
     base::AtomicRefCountInc(&all_profiles_restored_);
     DVLOG(1) << "All profiles merged " << all_profiles_restored_;
   }
 }
 
 // static
 bool MergeSessionThrottle::ShouldDelayRequest(
     int render_process_id,
     int render_view_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (!user_manager::UserManager::Get()->IsUserLoggedIn()) {
     return false;
   } else if (!user_manager::UserManager::Get()->
       IsLoggedInAsUserWithGaiaAccount()) {
     // This is not a regular user session, let's remove the throttle
     // permanently.
     if (!AreAllSessionMergedAlready())
       base::AtomicRefCountInc(&all_profiles_restored_);
 
@@ skipping 66 matching lines @@
   return false;
 }
 
 // static.
 void MergeSessionThrottle::DeleayResourceLoadingOnUIThread(
     ResourceType resource_type,
     int render_process_id,
     int render_view_id,
     const GURL& url,
     const CompletionCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   if (ShouldDelayRequest(render_process_id, render_view_id)) {
     // There is a chance that the tab closed after we decided to show
     // the offline page on the IO thread and before we actually show the
     // offline page here on the UI thread.
     RenderViewHost* render_view_host =
         RenderViewHost::FromID(render_process_id, render_view_id);
     WebContents* web_contents = render_view_host ?
         WebContents::FromRenderViewHost(render_view_host) : NULL;
     if (resource_type == content::RESOURCE_TYPE_MAIN_FRAME) {
       DVLOG(1) << "Creating page waiter for " << url.spec();
       (new chromeos::MergeSessionLoadPage(web_contents, url, callback))->Show();
     } else {
       DVLOG(1) << "Creating XHR waiter for " << url.spec();
       DCHECK(resource_type == content::RESOURCE_TYPE_XHR);
       Profile* profile = Profile::FromBrowserContext(
           web_contents->GetBrowserContext());
       (new chromeos::MergeSessionXHRRequestWaiter(profile,
                                                   callback))->StartWaiting();
     }
   } else {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, callback);
   }
 }