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

chrome/browser/chromeos/system_logs/touch_log_source_ozone.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/chromeos/system_logs/touch_log_source.h"
 
 #include "ash/touch/touch_hud_debug.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
@@ skipping 101 matching lines @@
   BrowserThread::PostBlockingPoolTask(
       FROM_HERE, base::Bind(CleanupEventLog, base::Passed(&log_paths)));
 }
 
 // Callback for handing the outcome of GetTouchEventLog().
 //
 // This is the end of the whole touch log collection process.
 void OnEventLogCollected(scoped_ptr<system_logs::SystemLogsResponse> response,
                          const system_logs::SysLogsSourceCallback& callback,
                          scoped_ptr<std::vector<base::FilePath>> log_paths) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // We cannot eliminate these temporaries and inline these closures because the
   // compiler may call release() before get().
   const base::Closure pack_closure =
       base::Bind(&PackEventLog, base::Unretained(response.get()),
                  base::Passed(&log_paths));
   const base::Closure callback_closure =
       base::Bind(callback, base::Owned(response.release()));
   BrowserThread::PostBlockingPoolTaskAndReply(FROM_HERE, pack_closure,
                                               callback_closure);
 }
 
 // Callback for handing the outcome of GetTouchDeviceStatus().
 //
 // Appends the collected log to the SystemLogsResponse map. Also goes on to
 // collect touch event logs.
 void OnStatusLogCollected(scoped_ptr<system_logs::SystemLogsResponse> response,
                           const system_logs::SysLogsSourceCallback& callback,
                           scoped_ptr<std::string> log) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   (*response)[kDeviceStatusLogDataKey] = *log;
 
   // Collect touch event logs.
   const base::FilePath kBaseLogPath(kTouchEventLogDir);
   ui::OzonePlatform::GetInstance()->GetInputController()->GetTouchEventLog(
       kBaseLogPath,
       base::Bind(&OnEventLogCollected, base::Passed(&response), callback));
 }
 
 // Collect touch HUD debug logs. This needs to be done on the UI thread.
 void CollectTouchHudDebugLog(system_logs::SystemLogsResponse* response) {
   scoped_ptr<base::DictionaryValue> dictionary =
       ash::TouchHudDebug::GetAllAsDictionary();
   if (!dictionary->empty()) {
     std::string touch_log;
     JSONStringValueSerializer json(&touch_log);
     json.set_pretty_print(true);
     if (json.Serialize(*dictionary) && !touch_log.empty())
       (*response)[kHUDLogDataKey] = touch_log;
   }
 }
 
 }  // namespace
 
 namespace system_logs {
 
 void TouchLogSource::Fetch(const SysLogsSourceCallback& callback) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(!callback.is_null());
 
   scoped_ptr<SystemLogsResponse> response(new SystemLogsResponse);
   CollectTouchHudDebugLog(response.get());
 
   // Collect touch device status logs.
   ui::OzonePlatform::GetInstance()->GetInputController()->GetTouchDeviceStatus(
       base::Bind(&OnStatusLogCollected, base::Passed(&response), callback));
 }
 
 }  // namespace system_logs