Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions.

chrome/browser/extensions/api/push_messaging/push_messaging_api.cc

 // Copyright (c) 2012 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/extensions/api/push_messaging/push_messaging_api.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 149 matching lines @@
   // handling for the identity related code.
   DVLOG(1) << "Cannot obtain access token for this user "
            << error.error_message() << " " << error.state();
   error_ = kUserAccessTokenFailure;
   ReportResult(std::string(), error_);
 }
 
 void PushMessagingGetChannelIdFunction::StartGaiaIdFetch(
     const std::string& access_token) {
   // Start the async fetch of the Gaia Id.
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   net::URLRequestContextGetter* context = GetProfile()->GetRequestContext();
   fetcher_.reset(new ObfuscatedGaiaIdFetcher(context, this, access_token));
 
   // Get the token cache and see if we have already cached a Gaia Id.
   TokenCacheService* token_cache =
       TokenCacheServiceFactory::GetForProfile(GetProfile());
 
   // Check the cache, if we already have a Gaia ID, use it instead of
   // fetching the ID over the network.
   const std::string& gaia_id =
       token_cache->RetrieveToken(GaiaConstants::kObfuscatedGaiaId);
   if (!gaia_id.empty()) {
     ReportResult(gaia_id, std::string());
     return;
   }
 
   fetcher_->Start();
 }
 
 // Check if the user is logged in.
 bool PushMessagingGetChannelIdFunction::IsUserLoggedIn() {
   invalidation::InvalidationAuthProvider* auth_provider =
       GetInvalidationAuthProvider();
   return auth_provider->GetTokenService()->RefreshTokenIsAvailable(
       auth_provider->GetAccountId());
 }
 
 void PushMessagingGetChannelIdFunction::ReportResult(
     const std::string& gaia_id, const std::string& error_string) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   BuildAndSendResult(gaia_id, error_string);
 
   // Cache the obfuscated ID locally. It never changes for this user,
   // and if we call the web API too often, we get errors due to rate limiting.
   if (!gaia_id.empty()) {
     base::TimeDelta timeout =
         base::TimeDelta::FromDays(kObfuscatedGaiaIdTimeoutInDays);
     TokenCacheService* token_cache =
         TokenCacheServiceFactory::GetForProfile(GetProfile());
@@ skipping 150 matching lines @@
 }
 
 template <>
 void
 BrowserContextKeyedAPIFactory<PushMessagingAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   DependsOn(invalidation::InvalidationServiceFactory::GetInstance());
 }
 
 }  // namespace extensions