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

chrome/browser/profile_resetter/profile_resetter.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/profile_resetter.h"
 
 #include <string>
 
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 19 matching lines @@
 #include "extensions/browser/management_policy.h"
 
 #if defined(OS_WIN)
 #include "base/base_paths.h"
 #include "base/path_service.h"
 #include "chrome/installer/util/shell_util.h"
 
 namespace {
 
 void ResetShortcutsOnFileThread() {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   // Get full path of chrome.
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return;
   BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BROWSER);
   for (int location = ShellUtil::SHORTCUT_LOCATION_FIRST;
        location < ShellUtil::NUM_SHORTCUT_LOCATIONS; ++location) {
     ShellUtil::ShortcutListMaybeRemoveUnknownArgs(
         static_cast<ShellUtil::ShortcutLocation>(location),
@@ skipping 69 matching lines @@
     if (resettable_flags & flagToMethod[i].flag) {
       reset_triggered_for_flags |= flagToMethod[i].flag;
       (this->*flagToMethod[i].method)();
     }
   }
 
   DCHECK_EQ(resettable_flags, reset_triggered_for_flags);
 }
 
 bool ProfileResetter::IsActive() const {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   return pending_reset_flags_ != 0;
 }
 
 void ProfileResetter::MarkAsDone(Resettable resettable) {
   DCHECK(CalledOnValidThread());
 
   // Check that we are never called twice or unexpectedly.
   CHECK(pending_reset_flags_ & resettable);
 
   pending_reset_flags_ &= ~resettable;
@@ skipping 178 matching lines @@
     ResetDefaultSearchEngine();
 }
 
 void ProfileResetter::OnBrowsingDataRemoverDone() {
   cookies_remover_ = NULL;
   MarkAsDone(COOKIES_AND_SITE_DATA);
 }
 
 std::vector<ShortcutCommand> GetChromeLaunchShortcuts(
     const scoped_refptr<SharedCancellationFlag>& cancel) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
 #if defined(OS_WIN)
   // Get full path of chrome.
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe))
     return std::vector<ShortcutCommand>();
   BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BROWSER);
   std::vector<ShortcutCommand> shortcuts;
   for (int location = ShellUtil::SHORTCUT_LOCATION_FIRST;
        location < ShellUtil::NUM_SHORTCUT_LOCATIONS; ++location) {
     if (cancel.get() && cancel->data.IsSet())
       break;
     ShellUtil::ShortcutListMaybeRemoveUnknownArgs(
         static_cast<ShellUtil::ShortcutLocation>(location),
         dist,
         ShellUtil::CURRENT_USER,
         chrome_exe,
         false,
         cancel,
         &shortcuts);
   }
   return shortcuts;
 #else
   return std::vector<ShortcutCommand>();
 #endif
 }