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

chrome/browser/chromeos/login/signin/merge_session_load_page.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_load_page.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/metrics/histogram.h"
@@ skipping 46 matching lines @@
     const GURL& url,
     const MergeSessionThrottle::CompletionCallback& callback)
     : callback_(callback),
       proceeded_(false),
       web_contents_(web_contents),
       url_(url) {
   interstitial_page_ = InterstitialPage::Create(web_contents, true, url, this);
 }
 
 MergeSessionLoadPage::~MergeSessionLoadPage() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 void MergeSessionLoadPage::Show() {
   OAuth2LoginManager* manager = GetOAuth2LoginManager();
   if (manager && manager->ShouldBlockTabLoading()) {
     manager->AddObserver(this);
     interstitial_page_->Show();
   } else {
     interstitial_page_->Proceed();
   }
@@ skipping 21 matching lines @@
 
 void MergeSessionLoadPage::OverrideRendererPrefs(
       content::RendererPreferences* prefs) {
   Profile* profile = Profile::FromBrowserContext(
       web_contents_->GetBrowserContext());
   renderer_preferences_util::UpdateFromSystemSettings(
       prefs, profile, web_contents_);
 }
 
 void MergeSessionLoadPage::OnProceed() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   proceeded_ = true;
   NotifyBlockingPageComplete();
 }
 
 void MergeSessionLoadPage::OnDontProceed() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // Ignore if it's already proceeded.
   if (proceeded_)
     return;
   NotifyBlockingPageComplete();
 }
 
 void MergeSessionLoadPage::CommandReceived(const std::string& cmd) {
   std::string command(cmd);
   // The Jasonified response has quotes, remove them.
   if (command.length() > 1 && command[0] == '"')
@@ skipping 24 matching lines @@
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   if (!profile)
     return NULL;
 
   return OAuth2LoginManagerFactory::GetInstance()->GetForProfile(profile);
 }
 
 void MergeSessionLoadPage::OnSessionRestoreStateChanged(
     Profile* user_profile, OAuth2LoginManager::SessionRestoreState state) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   OAuth2LoginManager* manager = GetOAuth2LoginManager();
   DVLOG(1) << "Merge session should "
            << (!manager->ShouldBlockTabLoading() ?
                   " NOT " : "")
            << " be blocking now, "
            << state;
   if (!manager->ShouldBlockTabLoading()) {
     manager->RemoveObserver(this);
     interstitial_page_->Proceed();
   }
 }
 
 }  // namespace chromeos