[chrome/browser/e*-i*] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/geolocation/chrome_access_token_store.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/geolocation/chrome_access_token_store.h"
 
 #include "base/bind.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 41 matching lines @@
         base::Bind(&TokenLoadingJob::PerformWorkOnUIThread, this),
         base::Bind(&TokenLoadingJob::RespondOnOriginatingThread, this));
   }
 
  private:
   friend class base::RefCountedThreadSafe<TokenLoadingJob>;
 
   ~TokenLoadingJob() {}
 
   void PerformWorkOnUIThread() {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DictionaryPrefUpdate update(g_browser_process->local_state(),
                                 prefs::kGeolocationAccessToken);
     base::DictionaryValue* token_dictionary = update.Get();
 
     std::vector<std::string> providers_to_remove;
     // The dictionary value could be NULL if the pref has never been set.
     if (token_dictionary != NULL) {
       for (base::DictionaryValue::Iterator it(*token_dictionary); !it.IsAtEnd();
            it.Advance()) {
         GURL url(it.key());
@@ skipping 34 matching lines @@
 void ChromeAccessTokenStore::LoadAccessTokens(
     const LoadAccessTokensCallbackType& callback) {
   scoped_refptr<TokenLoadingJob> job(new TokenLoadingJob(callback));
   job->Run();
 }
 
 ChromeAccessTokenStore::~ChromeAccessTokenStore() {}
 
 static void SetAccessTokenOnUIThread(const GURL& server_url,
                                      const base::string16& token) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DictionaryPrefUpdate update(g_browser_process->local_state(),
                               prefs::kGeolocationAccessToken);
   base::DictionaryValue* access_token_dictionary = update.Get();
   access_token_dictionary->SetWithoutPathExpansion(
       server_url.spec(), new base::StringValue(token));
 }
 
 void ChromeAccessTokenStore::SaveAccessToken(
     const GURL& server_url,
     const base::string16& access_token) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&SetAccessTokenOnUIThread, server_url, access_token));
 }