Files.app: Remove MountedDiskMonitor.

chrome/browser/chromeos/file_manager/volume_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 32 matching lines @@
     // Available on DEVICE_ADDED, DEVICE_REMOVED, VOLUME_MOUNTED,
     // VOLUME_UNMOUNTED, FORMAT_STARTED and FORMAT_COMPLETED.
     std::string device_path;
 
     // Available on DISK_ADDED.
     bool mounting;
 
     // 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;
   };
 
   LoggingObserver() {}
   virtual ~LoggingObserver() {}
 
   const std::vector<Event>& events() const { return events_; }
 
   // VolumeManagerObserver overrides.
@@ skipping 22 matching lines @@
   }
 
   virtual void OnDeviceRemoved(const std::string& device_path) OVERRIDE {
     Event event;
     event.type = Event::DEVICE_REMOVED;
     event.device_path = device_path;
     events_.push_back(event);
   }
 
   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);
   }
 
   virtual void OnVolumeUnmounted(chromeos::MountError error_code,
                                  const VolumeInfo& volume_info) OVERRIDE {
     Event event;
     event.type = Event::VOLUME_UNMOUNTED;
     event.device_path = volume_info.source_path.AsUTF8Unsafe();
     event.mount_error = error_code;
     events_.push_back(event);
@@ skipping 83 matching lines @@
   volume_manager()->AddObserver(&observer);
 
   volume_manager()->OnFileSystemMounted();
 
   ASSERT_EQ(1U, observer.events().size());
   LoggingObserver::Event event = observer.events()[0];
   EXPECT_EQ(LoggingObserver::Event::VOLUME_MOUNTED, event.type);
   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();
 
   ASSERT_EQ(2U, observer.events().size());
   event = observer.events()[1];
   EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED, event.type);
   EXPECT_EQ(drive::util::GetDriveMountPointPath(profile()).AsUTF8Unsafe(),
             event.device_path);
   EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
 
@@ skipping 271 matching lines @@
 
   volume_manager()->OnMountEvent(chromeos::disks::DiskMountManager::MOUNTING,
                                 chromeos::MOUNT_ERROR_NONE,
                                 kMountPoint);
 
   ASSERT_EQ(1U, observer.events().size());
   LoggingObserver::Event event = observer.events()[0];
   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,
                                 kMountPoint);
 
   ASSERT_EQ(2U, observer.events().size());
   event = observer.events()[1];
   EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED, event.type);
   EXPECT_EQ("device1", event.device_path);
   EXPECT_EQ(chromeos::MOUNT_ERROR_NONE, event.mount_error);
@@ skipping 42 matching lines @@
         chromeos::disks::DiskMountManager::MOUNTING,
         chromeos::MOUNT_ERROR_NONE,
         kMountPoint);
   }
 
   ASSERT_EQ(1U, observer.events().size());
   const LoggingObserver::Event& event = observer.events()[0];
   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);
 }
 
 TEST_F(VolumeManagerTest, OnMountEvent_UnmountingWithoutMounting) {
   LoggingObserver observer;
   volume_manager()->AddObserver(&observer);
 
   const chromeos::disks::DiskMountManager::MountPointInfo kMountPoint(
       "device1",
@@ skipping 290 matching lines @@
   // Detach
   volume_manager()->OnRemovableStorageDetached(info);
   ASSERT_EQ(2u, observer.events().size());
   EXPECT_EQ(LoggingObserver::Event::VOLUME_UNMOUNTED,
             observer.events()[1].type);
 
   EXPECT_FALSE(volume_manager()->FindVolumeInfoById("mtp:model", &volume_info));
 }
 
 }  // namespace file_manager