[chrome/test] favor DCHECK_CURRENTLY_ON for better logs

chrome/test/base/tracing.cc

 // Copyright (c) 2012 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/test/base/tracing.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 37 matching lines @@
   static InProcessTraceController* GetInstance() {
     return Singleton<InProcessTraceController>::get();
   }
 
   InProcessTraceController()
       : is_waiting_on_watch_(false),
         watch_notification_count_(0) {}
   virtual ~InProcessTraceController() {}
 
   bool BeginTracing(const std::string& category_patterns) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     return content::TracingController::GetInstance()->EnableRecording(
         base::trace_event::CategoryFilter(category_patterns),
         base::trace_event::TraceOptions(),
         content::TracingController::EnableRecordingDoneCallback());
   }
 
   bool BeginTracingWithWatch(const std::string& category_patterns,
                              const std::string& category_name,
                              const std::string& event_name,
                              int num_occurrences) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(num_occurrences > 0);
     watch_notification_count_ = num_occurrences;
     if (!content::TracingController::GetInstance()->SetWatchEvent(
             category_name, event_name,
             base::Bind(&InProcessTraceController::OnWatchEventMatched,
                        base::Unretained(this)))) {
       return false;
     }
     if (!content::TracingController::GetInstance()->EnableRecording(
             base::trace_event::CategoryFilter(category_patterns),
             base::trace_event::TraceOptions(),
             base::Bind(&InProcessTraceController::OnEnableTracingComplete,
                        base::Unretained(this)))) {
       return false;
     }
 
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
     return true;
   }
 
   bool WaitForWatchEvent(base::TimeDelta timeout) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     if (watch_notification_count_ == 0)
       return true;
 
     if (timeout != base::TimeDelta()) {
       timer_.Start(FROM_HERE, timeout, this,
                    &InProcessTraceController::Timeout);
     }
 
     is_waiting_on_watch_ = true;
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
     is_waiting_on_watch_ = false;
 
     return watch_notification_count_ == 0;
   }
 
   bool EndTracing(std::string* json_trace_output) {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
     using namespace base::debug;
 
     if (!content::TracingController::GetInstance()->DisableRecording(
             new StringTraceSink(
                 json_trace_output,
                 base::Bind(&InProcessTraceController::OnTracingComplete,
                            base::Unretained(this))))) {
       return false;
     }
     // Wait for OnEndTracingComplete() to quit the message loop.
@@ skipping 60 matching lines @@
 bool WaitForWatchEvent(base::TimeDelta timeout) {
   return InProcessTraceController::GetInstance()->WaitForWatchEvent(timeout);
 }
 
 bool EndTracing(std::string* json_trace_output) {
   return InProcessTraceController::GetInstance()->EndTracing(json_trace_output);
 }
 
 }  // namespace tracing