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

chrome/browser/android/bookmarks/partner_bookmarks_shim.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 "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 
 #include "base/lazy_instance.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 33 matching lines @@
 static const char kMappingProviderTitle[] = "provider_title";
 static const char kMappingTitle[] = "mapped_title";
 
 static bool g_disable_partner_bookmarks_editing = false;
 
 }  // namespace
 
 // static
 PartnerBookmarksShim* PartnerBookmarksShim::BuildForBrowserContext(
     content::BrowserContext* browser_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   PartnerBookmarksShim* data =
       static_cast<PartnerBookmarksShim*>(
           browser_context->GetUserData(kPartnerBookmarksShimUserDataKey));
   if (data)
     return data;
 
   data = new PartnerBookmarksShim(
       Profile::FromBrowserContext(browser_context)->GetPrefs());
   browser_context->SetUserData(kPartnerBookmarksShimUserDataKey, data);
@@ skipping 104 matching lines @@
     parent = parent->parent();
   }
   return false;
 }
 
 const BookmarkNode* PartnerBookmarksShim::GetPartnerBookmarksRoot() const {
   return g_partner_model_keeper.Get().partner_bookmarks_root.get();
 }
 
 void PartnerBookmarksShim::SetPartnerBookmarksRoot(BookmarkNode* root_node) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   g_partner_model_keeper.Get().partner_bookmarks_root.reset(root_node);
   g_partner_model_keeper.Get().loaded = true;
   FOR_EACH_OBSERVER(PartnerBookmarksShim::Observer, observers_,
                     PartnerShimLoaded(this));
 }
 
 PartnerBookmarksShim::NodeRenamingMapKey::NodeRenamingMapKey(
     const GURL& url, const base::string16& provider_title)
     : url_(url), provider_title_(provider_title) {}
 
 PartnerBookmarksShim::NodeRenamingMapKey::~NodeRenamingMapKey() {}
 
 bool operator<(const PartnerBookmarksShim::NodeRenamingMapKey& a,
                const PartnerBookmarksShim::NodeRenamingMapKey& b) {
   return (a.url_ < b.url_) ||
       (a.url_ == b.url_ && a.provider_title_ < b.provider_title_);
 }
 
 // static
 void PartnerBookmarksShim::ClearInBrowserContextForTesting(
     content::BrowserContext* browser_context) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   browser_context->SetUserData(kPartnerBookmarksShimUserDataKey, 0);
 }
 
 // static
 void PartnerBookmarksShim::ClearPartnerModelForTesting() {
   g_partner_model_keeper.Get().loaded = false;
   g_partner_model_keeper.Get().partner_bookmarks_root.reset(0);
 }
 
 // static
@@ skipping 18 matching lines @@
     return parent;
   for (int i = 0, child_count = parent->child_count(); i < child_count; ++i) {
     const BookmarkNode* result = GetNodeByID(parent->GetChild(i), id);
     if (result)
       return result;
   }
   return NULL;
 }
 
 void PartnerBookmarksShim::ReloadNodeMapping() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   node_rename_remove_map_.clear();
   if (!prefs_)
     return;
 
   const base::ListValue* list =
       prefs_->GetList(prefs::kPartnerBookmarkMappings);
   if (!list)
     return;
 
@@ skipping 14 matching lines @@
       NOTREACHED();
       continue;
     }
 
     const NodeRenamingMapKey key(GURL(url), provider_title);
     node_rename_remove_map_[key] = mapped_title;
   }
 }
 
 void PartnerBookmarksShim::SaveNodeMapping() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!prefs_)
     return;
 
   base::ListValue list;
   for (NodeRenamingMap::const_iterator i = node_rename_remove_map_.begin();
        i != node_rename_remove_map_.end();
        ++i) {
     base::DictionaryValue* dict = new base::DictionaryValue();
     dict->SetString(kMappingUrl, i->first.url().spec());
     dict->SetString(kMappingProviderTitle, i->first.provider_title());
     dict->SetString(kMappingTitle, i->second);
     list.Append(dict);
   }
   prefs_->Set(prefs::kPartnerBookmarkMappings, list);
 }