Files.app: Start to use DeviceEventRouter.

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 20 matching lines @@
   struct Event {
     enum EventType {
       DISK_ADDED,
       DISK_REMOVED,
       DEVICE_ADDED,
       DEVICE_REMOVED,
       VOLUME_MOUNTED,
       VOLUME_UNMOUNTED,
       FORMAT_STARTED,
       FORMAT_COMPLETED,
-      HARD_UNPLUGGED,
     } type;
 
     // 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.
@@ skipping 56 matching lines @@
 
   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);
   }
 
-  virtual void OnHardUnplugged(const std::string& device_path) OVERRIDE {
-    Event event;
-    event.type = Event::HARD_UNPLUGGED;
-    event.device_path = device_path;
-    events_.push_back(event);
-  }
-
   virtual void OnFormatStarted(
       const std::string& device_path, bool success) OVERRIDE {
     Event event;
     event.type = Event::FORMAT_STARTED;
     event.device_path = device_path;
     event.success = success;
     events_.push_back(event);
   }
 
   virtual void OnFormatCompleted(
@@ skipping 247 matching lines @@
   LoggingObserver observer;
   volume_manager()->AddObserver(&observer);
 
   const chromeos::disks::DiskMountManager::Disk kMountedDisk(
       "device1", "mount_path", "", "", "", "", "", "", "", "", "", "",
       chromeos::DEVICE_TYPE_UNKNOWN, 0, false, false, false, false, false,
       false);
   volume_manager()->OnDiskEvent(
       chromeos::disks::DiskMountManager::DISK_REMOVED, &kMountedDisk);
 
-  ASSERT_EQ(2U, observer.events().size());
+  ASSERT_EQ(1U, observer.events().size());
   const LoggingObserver::Event& event = observer.events()[0];
   EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, event.type);
   EXPECT_EQ("device1", event.device_path);
 
-  // Since the Disk has non-empty mount_path, it's regarded as hard unplugging.
-  EXPECT_EQ(LoggingObserver::Event::HARD_UNPLUGGED,
-            observer.events()[1].type);
-
   ASSERT_EQ(1U, disk_mount_manager_->unmount_requests().size());
   const FakeDiskMountManager::UnmountRequest& unmount_request =
       disk_mount_manager_->unmount_requests()[0];
   EXPECT_EQ("mount_path", unmount_request.mount_path);
   EXPECT_EQ(chromeos::UNMOUNT_OPTIONS_LAZY, unmount_request.options);
 
   volume_manager()->RemoveObserver(&observer);
 }
 
 TEST_F(VolumeManagerTest, OnDiskEvent_RemovedNotMounted) {
@@ skipping 420 matching lines @@
       chromeos::MOUNT_ERROR_NONE,
       chromeos::disks::DiskMountManager::MountPointInfo(
           "/other/profile/drive/folder/3.zip",
           "/archive/3",
           chromeos::MOUNT_TYPE_ARCHIVE,
           chromeos::disks::MOUNT_CONDITION_NONE));
   EXPECT_FALSE(volume_manager()->FindVolumeInfoById("archive:3", &volume_info));
   EXPECT_EQ(3u, observer.events().size());
 }
 
-TEST_F(VolumeManagerTest, HardUnplugged) {
-  volume_manager()->Initialize();
-  LoggingObserver observer;
-  volume_manager()->AddObserver(&observer);
-
-  // Disk that has a mount path is removed.
-  chromeos::disks::DiskMountManager::Disk mounted_disk(
-      "device1",
-      "/mount/path",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "uuid1",
-      "device1",
-      chromeos::DEVICE_TYPE_UNKNOWN,
-      0,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false);
-
-  chromeos::disks::DiskMountManager::Disk unmounted_disk(
-      "device2",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "",
-      "uuid2",
-      "device2",
-      chromeos::DEVICE_TYPE_UNKNOWN,
-      0,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false);
-
-  // Do not publish the hard_unplugged event for a disk that is already
-  // unmounted.
-  disk_mount_manager_->InvokeDiskEventForTest(
-      chromeos::disks::DiskMountManager::DISK_REMOVED, &unmounted_disk);
-  // Publish the hard_unplugged event for a disk that is currently mounted.
-  disk_mount_manager_->InvokeDiskEventForTest(
-      chromeos::disks::DiskMountManager::DISK_REMOVED, &mounted_disk);
-  // Do not publish the hard_unplugged event twice for the same disk.
-  disk_mount_manager_->InvokeDiskEventForTest(
-      chromeos::disks::DiskMountManager::DISK_REMOVED, &mounted_disk);
-
-  EXPECT_EQ(4u, observer.events().size());
-  EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, observer.events()[0].type);
-  EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, observer.events()[1].type);
-  EXPECT_EQ(LoggingObserver::Event::HARD_UNPLUGGED, observer.events()[2].type);
-  EXPECT_EQ(LoggingObserver::Event::DISK_REMOVED, observer.events()[3].type);
-}
-
 TEST_F(VolumeManagerTest, MTPPlugAndUnplug) {
   LoggingObserver observer;
   volume_manager()->AddObserver(&observer);
 
   storage_monitor::StorageInfo info(
       storage_monitor::StorageInfo::MakeDeviceId(
           storage_monitor::StorageInfo::MTP_OR_PTP, "dummy-device-id"),
       FILE_PATH_LITERAL("/dummy/device/location"),
       base::UTF8ToUTF16("label"),
       base::UTF8ToUTF16("vendor"),
@@ skipping 25 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