[chrome/browser/profile_resetter] favor DCHECK_CURRENTLY_ON for better logs

chrome/browser/profile_resetter/resettable_settings_snapshot.cc

 // Copyright (c) 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/profile_resetter/resettable_settings_snapshot.h"
 
 #include "base/json/json_writer.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 42 matching lines @@
   list->Append(results);
 }
 
 }  // namespace
 
 ResettableSettingsSnapshot::ResettableSettingsSnapshot(
     Profile* profile)
     : startup_(SessionStartupPref::GetStartupPref(profile)),
       shortcuts_determined_(false),
       weak_ptr_factory_(this) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   // URLs are always stored sorted.
   std::sort(startup_.urls.begin(), startup_.urls.end());
 
   PrefService* prefs = profile->GetPrefs();
   DCHECK(prefs);
   homepage_ = prefs->GetString(prefs::kHomePage);
   homepage_is_ntp_ = prefs->GetBoolean(prefs::kHomePageIsNewTabPage);
   show_home_button_ = prefs->GetBoolean(prefs::kShowHomeButton);
 
   TemplateURLService* service =
       TemplateURLServiceFactory::GetForProfile(profile);
   DCHECK(service);
   TemplateURL* dse = service->GetDefaultSearchProvider();
   if (dse)
     dse_url_ = dse->url();
 
   const extensions::ExtensionSet& enabled_ext =
       extensions::ExtensionRegistry::Get(profile)->enabled_extensions();
   enabled_extensions_.reserve(enabled_ext.size());
 
   for (extensions::ExtensionSet::const_iterator it = enabled_ext.begin();
        it != enabled_ext.end(); ++it)
     enabled_extensions_.push_back(std::make_pair((*it)->id(), (*it)->name()));
 
   // ExtensionSet is sorted but it seems to be an implementation detail.
   std::sort(enabled_extensions_.begin(), enabled_extensions_.end());
 }
 
 ResettableSettingsSnapshot::~ResettableSettingsSnapshot() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (cancellation_flag_.get())
     cancellation_flag_->data.Set();
 }
 
 void ResettableSettingsSnapshot::Subtract(
     const ResettableSettingsSnapshot& snapshot) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   ExtensionList extensions = base::STLSetDifference<ExtensionList>(
       enabled_extensions_, snapshot.enabled_extensions_);
   enabled_extensions_.swap(extensions);
 }
 
 int ResettableSettingsSnapshot::FindDifferentFields(
     const ResettableSettingsSnapshot& snapshot) const {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   int bit_mask = 0;
 
   if (startup_.type != snapshot.startup_.type ||
       startup_.urls != snapshot.startup_.urls)
     bit_mask |= STARTUP_MODE;
 
   if (homepage_is_ntp_ != snapshot.homepage_is_ntp_ ||
       homepage_ != snapshot.homepage_ ||
       show_home_button_ != snapshot.show_home_button_)
     bit_mask |= HOMEPAGE;
 
   if (dse_url_ != snapshot.dse_url_)
     bit_mask |= DSE_URL;
 
   if (enabled_extensions_ != snapshot.enabled_extensions_)
     bit_mask |= EXTENSIONS;
 
   if (shortcuts_ != snapshot.shortcuts_)
     bit_mask |= SHORTCUTS;
 
   static_assert(ResettableSettingsSnapshot::ALL_FIELDS == 31,
                 "new field needs to be added here");
 
   return bit_mask;
 }
 
 void ResettableSettingsSnapshot::RequestShortcuts(
     const base::Closure& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!cancellation_flag_.get() && !shortcuts_determined());
 
   cancellation_flag_ = new SharedCancellationFlag;
   content::BrowserThread::PostTaskAndReplyWithResult(
       content::BrowserThread::FILE,
       FROM_HERE,
       base::Bind(&GetChromeLaunchShortcuts, cancellation_flag_),
       base::Bind(&ResettableSettingsSnapshot::SetShortcutsAndReport,
                  weak_ptr_factory_.GetWeakPtr(),
                  callback));
 }
 
 void ResettableSettingsSnapshot::SetShortcutsAndReport(
     const base::Closure& callback,
     const std::vector<ShortcutCommand>& shortcuts) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   shortcuts_ = shortcuts;
   shortcuts_determined_ = true;
   cancellation_flag_ = NULL;
 
   if (!callback.is_null())
     callback.Run();
 }
 
 std::string SerializeSettingsReport(const ResettableSettingsSnapshot& snapshot,
                                     int field_mask) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   base::DictionaryValue dict;
 
   if (field_mask & ResettableSettingsSnapshot::STARTUP_MODE) {
     base::ListValue* list = new base::ListValue;
     const std::vector<GURL>& urls = snapshot.startup_urls();
     for (std::vector<GURL>::const_iterator i = urls.begin();
          i != urls.end(); ++i)
       list->AppendString(i->spec());
     dict.Set(kStartupURLPath, list);
     dict.SetInteger(kStartupTypePath, snapshot.startup_type());
@@ skipping 66 matching lines @@
   feedback_data->set_page_url("");
   feedback_data->set_user_email("");
 
   feedback_util::SendReport(feedback_data);
 }
 
 scoped_ptr<base::ListValue> GetReadableFeedbackForSnapshot(
     Profile* profile,
     const ResettableSettingsSnapshot& snapshot) {
   DCHECK(profile);
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   scoped_ptr<base::ListValue> list(new base::ListValue);
   AddPair(list.get(),
           l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_LOCALE),
           g_browser_process->GetApplicationLocale());
   AddPair(list.get(),
           l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_USER_AGENT),
           GetUserAgent());
   chrome::VersionInfo version_info;
   std::string version = version_info.Version();
   version += chrome::VersionInfo::GetVersionStringModifier();
@@ skipping 97 matching lines @@
       extension_names += '\n';
     extension_names += i->second;
   }
   if (!extension_names.empty()) {
     AddPair(list.get(),
             l10n_util::GetStringUTF16(IDS_RESET_PROFILE_SETTINGS_EXTENSIONS),
             extension_names);
   }
   return list.Pass();
 }