| Index: chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
|
| diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc b/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
|
| index aa41497a0fed8a6b7e50957fbac3cbebc10a855d..17c06499ac6728d18d11e9a0acf3698d8befee77 100644
|
| --- a/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
|
| +++ b/chrome/browser/chromeos/system/input_device_settings_impl_x11.cc
|
| @@ -62,7 +62,7 @@ void ExecuteScriptOnFileThread(const std::vector<std::string>& argv) {
|
| }
|
|
|
| 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;
|
| @@ -115,14 +115,14 @@ void DeviceExistsBlockingPool(const char* device_type,
|
| 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
|
|
|