Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2694)

Unified Diff: chrome/browser/storage_monitor/storage_monitor_win_unittest.cc

Issue 12476026: Disable drive scan on startup to avoid spinning floppy drives (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add DoNothing closure to spawn a thread early Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/storage_monitor/test_volume_mount_watcher_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/storage_monitor/storage_monitor_win_unittest.cc
diff --git a/chrome/browser/storage_monitor/storage_monitor_win_unittest.cc b/chrome/browser/storage_monitor/storage_monitor_win_unittest.cc
index bbf1687957c14559f52d044d21390f8c01bda6ed..18ad7bb3e5790b3ef24751dc058d6c828ee88083 100644
--- a/chrome/browser/storage_monitor/storage_monitor_win_unittest.cc
+++ b/chrome/browser/storage_monitor/storage_monitor_win_unittest.cc
@@ -97,6 +97,8 @@ void StorageMonitorWinTest::SetUp() {
void StorageMonitorWinTest::TearDown() {
RunUntilIdle();
monitor_->RemoveObserver(&observer_);
+ volume_mount_watcher_->ShutdownWorkerPool();
+ monitor_.reset(NULL);
}
void StorageMonitorWinTest::PreAttachDevices() {
@@ -320,7 +322,7 @@ TEST_F(StorageMonitorWinTest, DevicesAttachedAdjacentBits) {
DoMassStorageDeviceAttachedTest(device_indices);
}
-TEST_F(StorageMonitorWinTest, DevicesDetached) {
+TEST_F(StorageMonitorWinTest, DISABLED_DevicesDetached) {
PreAttachDevices();
DeviceIndices device_indices;
@@ -332,7 +334,7 @@ TEST_F(StorageMonitorWinTest, DevicesDetached) {
DoMassStorageDevicesDetachedTest(device_indices);
}
-TEST_F(StorageMonitorWinTest, DevicesDetachedHighBoundary) {
+TEST_F(StorageMonitorWinTest, DISABLED_DevicesDetachedHighBoundary) {
PreAttachDevices();
DeviceIndices device_indices;
@@ -341,7 +343,7 @@ TEST_F(StorageMonitorWinTest, DevicesDetachedHighBoundary) {
DoMassStorageDevicesDetachedTest(device_indices);
}
-TEST_F(StorageMonitorWinTest, DevicesDetachedLowBoundary) {
+TEST_F(StorageMonitorWinTest, DISABLED_DevicesDetachedLowBoundary) {
PreAttachDevices();
DeviceIndices device_indices;
@@ -350,7 +352,7 @@ TEST_F(StorageMonitorWinTest, DevicesDetachedLowBoundary) {
DoMassStorageDevicesDetachedTest(device_indices);
}
-TEST_F(StorageMonitorWinTest, DevicesDetachedAdjacentBits) {
+TEST_F(StorageMonitorWinTest, DISABLED_DevicesDetachedAdjacentBits) {
PreAttachDevices();
DeviceIndices device_indices;
@@ -411,7 +413,7 @@ TEST_F(StorageMonitorWinTest, DuplicateAttachCheckSuppressed) {
EXPECT_EQ(kAttachedDevicePath, checked_devices[1]);
}
-TEST_F(StorageMonitorWinTest, DeviceInfoForPath) {
+TEST_F(StorageMonitorWinTest, DISABLED_DeviceInfoForPath) {
PreAttachDevices();
// An invalid path.
« no previous file with comments | « no previous file | chrome/browser/storage_monitor/test_volume_mount_watcher_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698