diff options
Diffstat (limited to 'chromium/components/storage_monitor')
6 files changed, 25 insertions, 24 deletions
diff --git a/chromium/components/storage_monitor/mtab_watcher_linux.cc b/chromium/components/storage_monitor/mtab_watcher_linux.cc index 407530dc8ec..01f425cb3d9 100644 --- a/chromium/components/storage_monitor/mtab_watcher_linux.cc +++ b/chromium/components/storage_monitor/mtab_watcher_linux.cc @@ -11,6 +11,7 @@ #include <stdio.h> #include "base/bind.h" +#include "base/logging.h" #include "base/stl_util.h" #include "base/threading/scoped_blocking_call.h" diff --git a/chromium/components/storage_monitor/storage_monitor.cc b/chromium/components/storage_monitor/storage_monitor.cc index 899cf6eedbc..93209919db9 100644 --- a/chromium/components/storage_monitor/storage_monitor.cc +++ b/chromium/components/storage_monitor/storage_monitor.cc @@ -6,6 +6,7 @@ #include <utility> +#include "base/logging.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "components/storage_monitor/removable_storage_observer.h" diff --git a/chromium/components/storage_monitor/storage_monitor_mac.mm b/chromium/components/storage_monitor/storage_monitor_mac.mm index cfc0b027173..bc3cba5cf57 100644 --- a/chromium/components/storage_monitor/storage_monitor_mac.mm +++ b/chromium/components/storage_monitor/storage_monitor_mac.mm @@ -11,7 +11,6 @@ #include "base/mac/mac_util.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h" @@ -307,8 +306,8 @@ void StorageMonitorMac::EjectDevice( options->bsd_name = bsd_name; options->callback = std::move(callback); options->disk = std::move(disk); - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(EjectDisk, options)); + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(EjectDisk, options)); } // static diff --git a/chromium/components/storage_monitor/storage_monitor_mac_unittest.mm b/chromium/components/storage_monitor/storage_monitor_mac_unittest.mm index f13ef45d52c..9a7a6175e9e 100644 --- a/chromium/components/storage_monitor/storage_monitor_mac_unittest.mm +++ b/chromium/components/storage_monitor/storage_monitor_mac_unittest.mm @@ -14,7 +14,6 @@ #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" -#include "base/task/post_task.h" #include "components/storage_monitor/mock_removable_storage_observer.h" #include "components/storage_monitor/removable_device_constants.h" #include "components/storage_monitor/storage_info.h" @@ -60,8 +59,8 @@ class StorageMonitorMacTest : public testing::Test { } void UpdateDisk(StorageInfo info, StorageMonitorMac::UpdateType update_type) { - base::PostTask( - FROM_HERE, {content::BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&StorageMonitorMac::UpdateDisk, base::Unretained(monitor_.get()), update_type, base::Owned(new std::string("dummy_bsd_name")), info)); diff --git a/chromium/components/storage_monitor/storage_monitor_win.cc b/chromium/components/storage_monitor/storage_monitor_win.cc index ff44f90bedb..486bf0b499c 100644 --- a/chromium/components/storage_monitor/storage_monitor_win.cc +++ b/chromium/components/storage_monitor/storage_monitor_win.cc @@ -10,6 +10,7 @@ #include <shlobj.h> #include <stddef.h> +#include "base/logging.h" #include "base/win/wrapped_window_proc.h" #include "components/storage_monitor/portable_device_watcher_win.h" #include "components/storage_monitor/removable_device_constants.h" diff --git a/chromium/components/storage_monitor/volume_mount_watcher_win.cc b/chromium/components/storage_monitor/volume_mount_watcher_win.cc index 59f120f264f..4f3a5c1ca82 100644 --- a/chromium/components/storage_monitor/volume_mount_watcher_win.cc +++ b/chromium/components/storage_monitor/volume_mount_watcher_win.cc @@ -226,8 +226,8 @@ void EjectDeviceInThreadPool( // at not-just-drive-letter paths. if (drive_letter < L'A' || drive_letter > L'Z' || device != device.DirName()) { - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), StorageMonitor::EJECT_FAILURE)); return; } @@ -238,8 +238,8 @@ void EjectDeviceInThreadPool( nullptr, OPEN_EXISTING, 0, nullptr)); if (!volume_handle.IsValid()) { - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), StorageMonitor::EJECT_FAILURE)); return; } @@ -268,8 +268,8 @@ void EjectDeviceInThreadPool( return; } - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), StorageMonitor::EJECT_IN_USE)); return; } @@ -286,8 +286,8 @@ void EjectDeviceInThreadPool( if (!dismounted) { DeviceIoControl(volume_handle.Get(), FSCTL_UNLOCK_VOLUME, nullptr, 0, nullptr, 0, &bytes_returned, nullptr); - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), StorageMonitor::EJECT_OK)); return; } @@ -298,8 +298,8 @@ void EjectDeviceInThreadPool( if (!DeviceIoControl(volume_handle.Get(), IOCTL_STORAGE_MEDIA_REMOVAL, &pmr_buffer, sizeof(PREVENT_MEDIA_REMOVAL), nullptr, 0, &bytes_returned, nullptr)) { - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), StorageMonitor::EJECT_FAILURE)); return; } @@ -307,14 +307,14 @@ void EjectDeviceInThreadPool( // Physically eject or soft-eject the device. if (!DeviceIoControl(volume_handle.Get(), IOCTL_STORAGE_EJECT_MEDIA, nullptr, 0, nullptr, 0, &bytes_returned, nullptr)) { - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), StorageMonitor::EJECT_FAILURE)); return; } - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(std::move(callback), StorageMonitor::EJECT_OK)); + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(std::move(callback), StorageMonitor::EJECT_OK)); } } // namespace @@ -376,14 +376,14 @@ void VolumeMountWatcherWin::RetrieveInfoForDeviceAndAdd( base::WeakPtr<VolumeMountWatcherWin> volume_watcher) { StorageInfo info; if (!std::move(get_device_details_callback).Run(device_path, &info)) { - base::PostTask(FROM_HERE, {BrowserThread::UI}, - base::BindOnce(&VolumeMountWatcherWin::DeviceCheckComplete, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&VolumeMountWatcherWin::DeviceCheckComplete, volume_watcher, device_path)); return; } - base::PostTask( - FROM_HERE, {BrowserThread::UI}, + content::GetUIThreadTaskRunner({})->PostTask( + FROM_HERE, base::BindOnce(&VolumeMountWatcherWin::HandleDeviceAttachEventOnUIThread, volume_watcher, device_path, info)); } |