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

chrome/browser/chromeos/login/signin/oauth2_login_verifier.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/oauth2_login_verifier.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 46 matching lines @@
       user_request_context_(user_request_context),
       access_token_(oauthlogin_access_token),
       retry_count_(0) {
   DCHECK(delegate);
 }
 
 OAuth2LoginVerifier::~OAuth2LoginVerifier() {
 }
 
 void OAuth2LoginVerifier::VerifyUserCookies(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Delay the verification if the network is not connected or on a captive
   // portal.
   DelayNetworkCall(
       base::TimeDelta::FromMilliseconds(kRequestRestartDelay),
       base::Bind(&OAuth2LoginVerifier::StartAuthCookiesVerification,
                  AsWeakPtr()));
 }
 
 void OAuth2LoginVerifier::VerifyProfileTokens(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Delay the verification if the network is not connected or on a captive
   // portal.
   DelayNetworkCall(base::TimeDelta::FromMilliseconds(kRequestRestartDelay),
                    base::Bind(&OAuth2LoginVerifier::VerifyProfileTokensImpl,
                               AsWeakPtr(), profile));
 }
 
 void OAuth2LoginVerifier::VerifyProfileTokensImpl(Profile* profile) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   gaia_token_.clear();
   if (access_token_.empty()) {
     // Fetch /OAuthLogin scoped access token.
     StartFetchingOAuthLoginAccessToken(profile);
   } else {
     // If OAuthLogin-scoped access token already exists (if it's generated
     // together with freshly minted refresh token), then fetch GAIA uber token.
     StartOAuthLoginForUberToken();
   }
@@ skipping 26 matching lines @@
 void OAuth2LoginVerifier::OnUberAuthTokenSuccess(
     const std::string& uber_token) {
   VLOG(1) << "OAuthLogin(uber_token) successful!";
   retry_count_ = 0;
   gaia_token_ = uber_token;
   StartMergeSession();
 }
 
 void OAuth2LoginVerifier::OnUberAuthTokenFailure(
     const GoogleServiceAuthError& error) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   LOG(WARNING) << "OAuthLogin(uber_token) failed,"
                << " error: " << error.state();
   RetryOnError("OAuthLoginUberToken", error,
                base::Bind(&OAuth2LoginVerifier::StartOAuthLoginForUberToken,
                           AsWeakPtr()),
                base::Bind(&Delegate::OnSessionMergeFailure,
                           base::Unretained(delegate_)));
 }
 
 void OAuth2LoginVerifier::StartMergeSession() {
   DCHECK(!gaia_token_.empty());
   gaia_fetcher_.reset(
       new GaiaAuthFetcher(this,
                           std::string(GaiaConstants::kChromeOSSource),
                           user_request_context_.get()));
   gaia_fetcher_->StartMergeSession(gaia_token_, std::string());
 }
 
 void OAuth2LoginVerifier::OnMergeSessionSuccess(const std::string& data) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   VLOG(1) << "MergeSession successful.";
   delegate_->OnSessionMergeSuccess();
   // Schedule post-merge verification to analyze how many LSID/SID overruns
   // were created by the session restore.
   SchedulePostMergeVerification();
 }
 
 void OAuth2LoginVerifier::SchedulePostMergeVerification() {
   BrowserThread::PostDelayedTask(
       BrowserThread::UI,
@@ skipping 34 matching lines @@
 
   VLOG(1) << "Got OAuth2 access token!";
   retry_count_ = 0;
   access_token_ = access_token;
   StartOAuthLoginForUberToken();
 }
 
 void OAuth2LoginVerifier::OnGetTokenFailure(
     const OAuth2TokenService::Request* request,
     const GoogleServiceAuthError& error) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK_EQ(login_token_request_.get(), request);
   login_token_request_.reset();
 
   LOG(WARNING) << "Failed to get OAuth2 access token, "
                << " error: " << error.state();
   UMA_HISTOGRAM_ENUMERATION(
       base::StringPrintf("OAuth2Login.%sFailure", "GetOAuth2AccessToken"),
       error.state(),
       GoogleServiceAuthError::NUM_STATES);
   delegate_->OnSessionMergeFailure(IsConnectionOrServiceError(error));
 }
 
 void OAuth2LoginVerifier::OnListAccountsSuccess(
     const std::string& data) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   VLOG(1) << "ListAccounts successful.";
   delegate_->OnListAccountsSuccess(data);
 }
 
 void OAuth2LoginVerifier::OnListAccountsFailure(
     const GoogleServiceAuthError& error) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   LOG(WARNING) << "Failed to get list of session accounts, "
                << " error: " << error.state();
   RetryOnError(
       "ListAccounts",
       error,
       base::Bind(&OAuth2LoginVerifier::StartAuthCookiesVerification,
                  AsWeakPtr()),
       base::Bind(&Delegate::OnListAccountsFailure,
                  base::Unretained(delegate_)));
 }
@@ skipping 19 matching lines @@
                << operation_id;
   UMA_HISTOGRAM_ENUMERATION(
       base::StringPrintf("OAuth2Login.%sFailure", operation_id),
       error.state(),
       GoogleServiceAuthError::NUM_STATES);
 
   error_handler.Run(IsConnectionOrServiceError(error));
 }
 
 }  // namespace chromeos