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

Unified Diff: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

Issue 479563007: Files.app: Remove MountedDiskMonitor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 6 years, 4 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/chromeos/file_manager/volume_manager_observer.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
diff --git a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
index 92c308d9602606dc31724ce2f4814221eb505659..3e0748b142ce00d56276818123ffcda68a43540a 100644
--- a/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
+++ b/chrome/browser/chromeos/file_manager/volume_manager_unittest.cc
@@ -50,9 +50,6 @@ class LoggingObserver : public VolumeManagerObserver {
// Available on VOLUME_MOUNTED and VOLUME_UNMOUNTED.
chromeos::MountError mount_error;
- // Available on VOLUME_MOUNTED.
- bool is_remounting;
-
// Available on FORMAT_STARTED and FORMAT_COMPLETED.
bool success;
};
@@ -95,13 +92,11 @@ class LoggingObserver : public VolumeManagerObserver {
}
virtual void OnVolumeMounted(chromeos::MountError error_code,
- const VolumeInfo& volume_info,
- bool is_remounting) OVERRIDE {
+ const VolumeInfo& volume_info) OVERRIDE {
Event event;
event.type = Event::VOLUME_MOUNTED;
event.device_path = volume_info.source_path.AsUTF8Unsafe();
event.mount_error = error_code;
- event.is_remounting = is_remounting;
events_.push_back(event);
}
@@ -205,7 +200,6 @@ TEST_F(VolumeManagerTest, OnDriveFileSystemMountAndUnmount) {
EXPECT_EQ(drive::util::GetDriveMountPointPath(profile()).AsUTF8Unsafe(),
event.device_path);
EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
- EXPECT_FALSE(event.is_remounting);
volume_manager()->OnFileSystemBeingUnmounted();
@@ -497,7 +491,6 @@ TEST_F(VolumeManagerTest, OnMountEvent_MountingAndUnmounting) {
EXPECT_EQ(LoggingObserver::Event::VOLUME_MOUNTED, event.type);
EXPECT_EQ("device1", event.device_path);
EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
- EXPECT_FALSE(event.is_remounting);
volume_manager()->OnMountEvent(chromeos::disks::DiskMountManager::UNMOUNTING,
chromeos::MOUNT_ERROR_NONE,
@@ -560,7 +553,6 @@ TEST_F(VolumeManagerTest, OnMountEvent_Remounting) {
EXPECT_EQ(LoggingObserver::Event::VOLUME_MOUNTED, event.type);
EXPECT_EQ("device1", event.device_path);
EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
- EXPECT_TRUE(event.is_remounting);
volume_manager()->RemoveObserver(&observer);
}
« no previous file with comments | « chrome/browser/chromeos/file_manager/volume_manager_observer.h ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698