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

Unified Diff: chrome/browser/extensions/api/image_writer_private/test_utils.cc

Issue 282853003: Unmounts volumes before writing to a drive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adds compile guard to Chrome OS includes in test_utils.h Created 6 years, 7 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 | « chrome/browser/extensions/api/image_writer_private/test_utils.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/image_writer_private/test_utils.cc
diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.cc b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
index 74cd9d2975d7bb0aeca218a7570ffb2d9d59994a..6800574372d3e77dadef7a967549ec9f80827b78 100644
--- a/chrome/browser/extensions/api/image_writer_private/test_utils.cc
+++ b/chrome/browser/extensions/api/image_writer_private/test_utils.cc
@@ -55,6 +55,17 @@ MockOperationManager::MockOperationManager(content::BrowserContext* context)
: OperationManager(context) {}
MockOperationManager::~MockOperationManager() {}
+#if defined(OS_CHROMEOS)
+FakeDiskMountManager::FakeDiskMountManager() {}
+FakeDiskMountManager::~FakeDiskMountManager() {}
+
+void FakeDiskMountManager::UnmountDeviceRecursively(
+ const std::string& device_path,
+ const UnmountDeviceRecursivelyCallbackType& callback) {
+ base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(callback, true));
+}
+#endif
+
FakeImageWriterClient::FakeImageWriterClient() {}
FakeImageWriterClient::~FakeImageWriterClient() {}
@@ -131,12 +142,33 @@ void ImageWriterUnitTestBase::SetUp() {
fake_dbus_thread_manager->SetImageBurnerClient(image_burner_fake.Pass());
chromeos::DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
}
+ FakeDiskMountManager* disk_manager = new FakeDiskMountManager();
+ chromeos::disks::DiskMountManager::InitializeForTesting(disk_manager);
+
+ // Adds a disk entry for test_device_path_ with the same device and file path.
+ disk_manager->CreateDiskEntryForMountDevice(
+ chromeos::disks::DiskMountManager::MountPointInfo(
+ test_device_path_.value(),
+ "/dummy/mount",
+ chromeos::MOUNT_TYPE_DEVICE,
+ chromeos::disks::MOUNT_CONDITION_NONE),
+ "device_id",
+ "device_label",
+ "Vendor",
+ "Product",
+ chromeos::DEVICE_TYPE_USB,
+ kTestFileSize,
+ true,
+ true,
+ false);
+ disk_manager->SetupDefaultReplies();
#endif
}
void ImageWriterUnitTestBase::TearDown() {
#if defined(OS_CHROMEOS)
chromeos::DBusThreadManager::Shutdown();
+ chromeos::disks::DiskMountManager::Shutdown();
#endif
}
« no previous file with comments | « chrome/browser/extensions/api/image_writer_private/test_utils.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698