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

chrome/browser/profile_resetter/automatic_profile_resetter_delegate.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/profile_resetter/automatic_profile_resetter_delegate.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 287 matching lines @@
   profile_resetter_.reset(new ProfileResetter(profile_));
   FetchBrandcodedDefaultSettingsIfNeeded();
   RequestCallbackWhenBrandcodedDefaultsAreFetched(base::Bind(
       &AutomaticProfileResetterDelegateImpl::RunProfileSettingsReset,
       AsWeakPtr(),
       send_feedback,
       completion));
 }
 
 void AutomaticProfileResetterDelegateImpl::OnTemplateURLServiceChanged() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(template_url_service_);
   if (template_url_service_->loaded() &&
       !template_url_service_ready_event_.is_signaled())
     template_url_service_ready_event_.Signal();
 }
 
 void AutomaticProfileResetterDelegateImpl::DismissPrompt() {
   DCHECK(global_error_service_);
   GlobalError* global_error =
       global_error_service_->GetGlobalErrorByMenuItemCommandID(
           IDC_SHOW_SETTINGS_RESET_BUBBLE);
   if (global_error) {
     // This will also close/destroy the Bubble UI if it is currently shown.
     global_error_service_->RemoveGlobalError(global_error);
     delete global_error;
   }
 }
 
 void AutomaticProfileResetterDelegateImpl::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (type == chrome::NOTIFICATION_MODULE_LIST_ENUMERATED &&
       !modules_have_been_enumerated_event_.is_signaled()) {
 #if defined(OS_WIN)
     module_list_.reset(EnumerateModulesModel::GetInstance()->GetModuleList());
 #endif
     modules_have_been_enumerated_event_.Signal();
   }
 }
 
 void AutomaticProfileResetterDelegateImpl::SendFeedback(
@@ skipping 15 matching lines @@
                            send_feedback,
                            base::Bind(&AutomaticProfileResetterDelegateImpl::
                                           OnProfileSettingsResetCompleted,
                                       AsWeakPtr(),
                                       completion,
                                       base::Passed(&old_settings_snapshot)));
 }
 
 void AutomaticProfileResetterDelegateImpl::
     OnBrandcodedDefaultsFetched() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(brandcoded_config_fetcher_);
   DCHECK(!brandcoded_config_fetcher_->IsActive());
   brandcoded_defaults_ = brandcoded_config_fetcher_->GetSettings();
   if (!brandcoded_defaults_)
     brandcoded_defaults_.reset(new BrandcodedDefaultSettings);
   brandcoded_defaults_fetched_event_.Signal();
 }
 
 void AutomaticProfileResetterDelegateImpl::OnProfileSettingsResetCompleted(
     const base::Closure& user_callback,
     scoped_ptr<ResettableSettingsSnapshot> old_settings_snapshot) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (old_settings_snapshot) {
     ResettableSettingsSnapshot new_settings_snapshot(profile_);
     int difference =
         old_settings_snapshot->FindDifferentFields(new_settings_snapshot);
     if (difference) {
       old_settings_snapshot->Subtract(new_settings_snapshot);
       std::string report =
           SerializeSettingsReport(*old_settings_snapshot, difference);
       SendFeedback(report);
     }
   }
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE, user_callback);
 }