Update Windows System Monitor Removable Device Impl.

chrome/browser/system_monitor/removable_device_notifications_linux_unittest.cc

 // Copyright (c) 2012 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.
 
 // RemovableDeviceNotificationsLinux unit tests.
 
 #include "chrome/browser/system_monitor/removable_device_notifications_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
@@ skipping 546 matching lines @@
   EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(0);
   OverwriteMtabAndRunLoop(test_data1, arraysize(test_data1));
 
   // Detach all devices.
   EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(1);
   WriteEmptyMtabAndRunLoop();
 }
 
-TEST_F(RemovableDeviceNotificationLinuxTest, MountLookUp) {
-  FilePath test_path_a = CreateMountPointWithDCIMDir(kMountPointA);
-  FilePath test_path_b = CreateMountPointWithoutDCIMDir(kMountPointB);
-  FilePath test_path_c = CreateMountPointWithoutDCIMDir(kMountPointC);
-  ASSERT_FALSE(test_path_a.empty());
-  ASSERT_FALSE(test_path_b.empty());
-  ASSERT_FALSE(test_path_c.empty());
-
-  // Attach to one first. (*'d mounts are those SystemMonitor knows about.)
-  // kDeviceDCIM1  -> kMountPointA *
-  // kDeviceNoDCIM -> kMountPointB *
-  // kDeviceFixed  -> kMountPointC
-  MtabTestData test_data1[] = {
-    MtabTestData(kDeviceDCIM1, test_path_a.value(), kValidFS),
-    MtabTestData(kDeviceNoDCIM, test_path_b.value(), kValidFS),
-    MtabTestData(kDeviceFixed, test_path_c.value(), kValidFS),
-  };
-  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(2);
-  EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(0);
-  AppendToMtabAndRunLoop(test_data1, arraysize(test_data1));
-
-  EXPECT_EQ(test_path_a,
-            notifier()->GetDeviceMountPoint(GetDeviceId(kDeviceDCIM1)));
-  EXPECT_EQ(test_path_b,
-            notifier()->GetDeviceMountPoint(GetDeviceId(kDeviceNoDCIM)));
-  EXPECT_EQ(test_path_c,
-            notifier()->GetDeviceMountPoint(GetDeviceId(kDeviceFixed)));
-  EXPECT_EQ(FilePath(),
-            notifier()->GetDeviceMountPoint(GetDeviceId(kInvalidDevice)));
-
-  // Make |kDeviceDCIM1| mounted in multiple places.
-  // kDeviceDCIM1 -> kMountPointA *
-  // kDeviceDCIM1 -> kMountPointB
-  // kDeviceDCIM1 -> kMountPointC
-  MtabTestData test_data2[] = {
-    MtabTestData(kDeviceDCIM1, test_path_a.value(), kValidFS),
-    MtabTestData(kDeviceDCIM1, test_path_b.value(), kValidFS),
-    MtabTestData(kDeviceDCIM1, test_path_c.value(), kValidFS),
-  };
-  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
-  EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(1);
-  // Add DCIM dirs.
-  CreateMountPointWithDCIMDir(kMountPointB);
-  CreateMountPointWithDCIMDir(kMountPointC);
-  OverwriteMtabAndRunLoop(test_data2, arraysize(test_data2));
-
-  EXPECT_EQ(test_path_a,
-            notifier()->GetDeviceMountPoint(GetDeviceId(kDeviceDCIM1)));
-
-  // Unmount |kDeviceDCIM1| from |kMountPointA|.
-  // kDeviceDCIM1 -> kMountPointB *
-  // kDeviceDCIM1 -> kMountPointC
-  // Either |kMountPointB| or |kMountPointC| is a valid new default, but
-  // it turns out that it will be B.
-  MtabTestData test_data3[] = {
-    MtabTestData(kDeviceDCIM1, test_path_b.value(), kValidFS),
-  };
-  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(1);
-  EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(1);
-  OverwriteMtabAndRunLoop(test_data3, arraysize(test_data3));
-
-  EXPECT_EQ(test_path_b,
-            notifier()->GetDeviceMountPoint(GetDeviceId(kDeviceDCIM1)));
-
-  // Mount a non-removable device in multiple places.
-  // kDeviceFixed -> kMountPointA
-  // kDeviceFixed -> kMountPointB
-  // kDeviceFixed -> kMountPointC
-  MtabTestData test_data4[] = {
-    MtabTestData(kDeviceFixed, test_path_a.value(), kValidFS),
-    MtabTestData(kDeviceFixed, test_path_b.value(), kValidFS),
-    MtabTestData(kDeviceFixed, test_path_c.value(), kValidFS),
-  };
-  EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
-  EXPECT_CALL(observer(), OnRemovableStorageDetached(_)).Times(1);
-  // Remove DCIM dirs.
-  RemoveDCIMDirFromMountPoint(kMountPointA);
-  RemoveDCIMDirFromMountPoint(kMountPointB);
-  RemoveDCIMDirFromMountPoint(kMountPointC);
-  OverwriteMtabAndRunLoop(test_data4, arraysize(test_data4));
-
-  // Any of the mount points would be valid.
-  EXPECT_EQ(test_path_a.value(),
-            notifier()->GetDeviceMountPoint(GetDeviceId(kDeviceFixed)).value());
-}
-
 TEST_F(RemovableDeviceNotificationLinuxTest, DeviceLookUp) {
   FilePath test_path_a = CreateMountPointWithDCIMDir(kMountPointA);
   FilePath test_path_b = CreateMountPointWithoutDCIMDir(kMountPointB);
   FilePath test_path_c = CreateMountPointWithoutDCIMDir(kMountPointC);
   ASSERT_FALSE(test_path_a.empty());
   ASSERT_FALSE(test_path_b.empty());
   ASSERT_FALSE(test_path_c.empty());
 
   // Attach to one first. (*'d mounts are those SystemMonitor knows about.)
   // kDeviceDCIM1  -> kMountPointA *
@@ skipping 53 matching lines @@
   EXPECT_TRUE(notifier()->GetDeviceInfoForPath(test_path_b, &device_info));
   EXPECT_EQ(GetDeviceId(kDeviceFixed), device_info.device_id);
 
   EXPECT_TRUE(notifier()->GetDeviceInfoForPath(test_path_c, &device_info));
   EXPECT_EQ(GetDeviceId(kDeviceFixed), device_info.device_id);
 }
 
 }  // namespace
 
 }  // namespace chrome