favor DCHECK_CURRENTLY_ON for better logs in components/ (part 2)

components/autofill/content/browser/wallet/wallet_signin_helper.cc

 // Copyright 2013 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 "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/callback_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
@@ skipping 20 matching lines @@
 namespace {
 
 const char kWalletCookieName[] = "gdtoken";
 
 // Callback for retrieving Google Wallet cookies. |callback| is passed the
 // retrieved cookies and posted back to the UI thread. |cookies| is any Google
 // Wallet cookies.
 void GetGoogleCookiesCallback(
     const base::Callback<void(const std::string&)>& callback,
     const net::CookieList& cookies) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   // Cookies for parent domains will also be returned; we only want cookies with
   // exact host matches. TODO(estade): really?
   std::string host = wallet::GetPassiveAuthUrl(0).host();
   std::string wallet_cookie;
   for (size_t i = 0; i < cookies.size(); ++i) {
     if (LowerCaseEqualsASCII(cookies[i].Name(), kWalletCookieName) &&
         LowerCaseEqualsASCII(cookies[i].Domain(), host.c_str())) {
       wallet_cookie = cookies[i].Value();
       break;
     }
   }
   content::BrowserThread::PostTask(content::BrowserThread::UI,
                                    FROM_HERE,
                                    base::Bind(callback, wallet_cookie));
 }
 
 // Gets Google Wallet cookies. Must be called on the IO thread.
 // |request_context_getter| is a getter for the current request context.
 // |callback| is called when retrieving cookies is completed.
 void GetGoogleCookies(
     scoped_refptr<net::URLRequestContextGetter> request_context_getter,
     const base::Callback<void(const std::string&)>& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   net::URLRequestContext* url_request_context =
       request_context_getter->GetURLRequestContext();
   net::CookieStore* cookie_store = url_request_context ?
       url_request_context->cookie_store() : NULL;
   net::CookieMonster* cookie_monster = cookie_store ?
       cookie_store->GetCookieMonster() : NULL;
   if (!cookie_monster) {
     content::BrowserThread::PostTask(content::BrowserThread::UI,
                                      FROM_HERE,
@@ skipping 83 matching lines @@
     OnServiceError(
         GoogleServiceAuthError(GoogleServiceAuthError::USER_NOT_SIGNED_UP));
     return;
   }
 
   delegate_->OnPassiveSigninSuccess();
 }
 
 void WalletSigninHelper::ReturnWalletCookieValue(
     const std::string& cookie_value) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   delegate_->OnDidFetchWalletCookieValue(cookie_value);
 }
 
 }  // namespace wallet
 }  // namespace autofill