Eliminate getting disk metadata for floppy drives.

chrome/browser/storage_monitor/volume_mount_watcher_win.cc

Index: chrome/browser/storage_monitor/volume_mount_watcher_win.cc
diff --git a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
index 3c7a9d3930370249c99e3de344b7a5fef0265691..95130c9e56a13e4a35899dd5675df58710a4118d 100644
--- a/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
+++ b/chrome/browser/storage_monitor/volume_mount_watcher_win.cc
@@ -22,21 +22,31 @@ namespace {
 
 const DWORD kMaxPathBufLen = MAX_PATH + 1;
 
-bool IsRemovable(const string16& mount_point) {
-  if (GetDriveType(mount_point.c_str()) != DRIVE_REMOVABLE)
-    return false;
-
-  // We don't consider floppy disks as removable, so check for that.
+string16 QueryDevicePath(const string16& mount_point) {
   string16 device = mount_point;
   if (EndsWith(mount_point, L"\\", false))
     device = mount_point.substr(0, device.length() - 1);
   string16 device_path;
   if (!QueryDosDevice(device.c_str(), WriteInto(&device_path, kMaxPathBufLen),
                       kMaxPathBufLen))
-    return true;
+    return string16();
+  return device_path;
+}
+
+bool IsRemovable(const string16& mount_point) {

[vandebo (ex-Chrome), 2013/03/06 00:38:26]

Instead of splitting this into two functions that basically do the same thing,
how about changing it to DeviceType GetDeviceType(...); enum DeviceType {
Floppy, Removable, Fixed}; ?

Line 94 can then set the removable boolean as well as skip the rest if it's a
floppy and line 158 can test for exactly removable (which was the old definition
of IsRemovable).

[Greg Billock, 2013/03/06 01:40:03]

I like that plan.

+  if (GetDriveType(mount_point.c_str()) != DRIVE_REMOVABLE)
+    return false;
+
+  // We don't consider floppy disks as removable, so check for that.
+  string16 device_path = QueryDevicePath(mount_point);
   return device_path.find(L"Floppy") == string16::npos;
 }
 
+bool IsFloppyDrive(const string16& mount_point) {
+  string16 device_path = QueryDevicePath(mount_point);
+  return device_path.find(L"Floppy") != string16::npos;
+}
+
 // Returns 0 if the devicetype is not volume.
 uint32 GetVolumeBitMaskFromBroadcastHeader(LPARAM data) {
   DEV_BROADCAST_VOLUME* dev_broadcast_volume =
@@ -87,6 +97,11 @@ bool GetDeviceDetails(const base::FilePath& device_path,
   if (device_location)
     *device_location = mount_point;
 
+  // If we're adding a floppy drive, return without querying any more
+  // drive metadata -- it will cause the floppy drive to seek.
+  if (IsFloppyDrive(device_path))
+    return true;
+
   if (volume_size)
     *volume_size = GetVolumeSize(mount_point);