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

chrome/browser/chromeos/system/input_device_settings_impl_x11.cc

 // Copyright 2014 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/input_device_settings.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 44 matching lines @@
   if (!ScriptExists(script))
     return;
 
   base::Process process =
       base::LaunchProcess(base::CommandLine(argv), base::LaunchOptions());
   if (process.IsValid())
     base::EnsureProcessGetsReaped(process.Pid());
 }
 
 void ExecuteScript(const std::vector<std::string>& argv) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   if (argv.size() == 1)
     return;
 
   VLOG(1) << "About to launch: \""
           << base::CommandLine(argv).GetCommandLineString() << "\"";
 
   // Control scripts can take long enough to cause SIGART during shutdown
   // (http://crbug.com/261426). Run the blocking pool task with
   // CONTINUE_ON_SHUTDOWN so it won't be joined when Chrome shuts down.
@@ skipping 32 matching lines @@
   std::string output;
   // Output is empty if the device is not found.
   exists->data =
       base::GetAppOutput(base::CommandLine(argv), &output) && !output.empty();
   DVLOG(1) << "DeviceExistsBlockingPool:" << device_type << "=" << exists->data;
 }
 
 void RunCallbackUIThread(
     scoped_refptr<RefCountedBool> exists,
     const InputDeviceSettings::DeviceExistsCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG(1) << "RunCallbackUIThread " << exists->data;
   callback.Run(exists->data);
 }
 
 void DeviceExists(const char* script,
                   const InputDeviceSettings::DeviceExistsCallback& callback) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   // One or both of the control scripts can apparently hang during shutdown
   // (http://crbug.com/255546). Run the blocking pool task with
   // CONTINUE_ON_SHUTDOWN so it won't be joined when Chrome shuts down.
   scoped_refptr<RefCountedBool> exists(new RefCountedBool(false));
   base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
   scoped_refptr<base::TaskRunner> runner =
       pool->GetTaskRunnerWithShutdownBehavior(
           base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
   runner->PostTaskAndReply(
@@ skipping 179 matching lines @@
 void InputDeviceSettings::SetSettingsForTesting(
     InputDeviceSettings* test_settings) {
   if (g_test_instance == test_settings)
     return;
   delete g_test_instance;
   g_test_instance = test_settings;
 }
 
 }  // namespace system
 }  // namespace chromeos