[Win, MediaGallery] Check the portable device pnp device id to filter the mass storage class device…

chrome/browser/system_monitor/portable_device_watcher_win.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.
 //
 // Any tasks that communicates with the portable device may take >100ms to
 // complete. Those tasks should be run on an blocking thread instead of the
 // UI thread.
 
 #include "chrome/browser/system_monitor/portable_device_watcher_win.h"
 
@@ skipping 276 matching lines @@
     hr = storage_ids->GetAt(index, &object_id);
     if (SUCCEEDED(hr) && (object_id.pwszVal != NULL) &&
         (object_id.vt == VT_LPWSTR)) {
       storage_object_ids->push_back(object_id.pwszVal);
     }
     PropVariantClear(&object_id);
   }
   return true;
 }
 
-// Returns true if the portable device is mounted on a volume. |device_name|
-// specifies the name of the device.
-bool IsVolumeMountedPortableDevice(const string16& device_name) {
+// Returns true if the portable device belongs to a mass storage class.
+// |pnp_device_id| specifies the plug and play device id.
+// |device_name| specifies the name of the device.
+bool IsMassStoragePortableDevice(const string16& pnp_device_id,
+                                 const string16& device_name) {
+  // Based on testing, if the pnp device id starts with "\\?\wpdbusenumroot#",
+  // then the attached device belongs to a mass storage class.
+  if (StartsWith(pnp_device_id, L"\\\\?\\wpdbusenumroot#", false))
+    return true;
+
   // If the device is a volume mounted device, |device_name| will be
   // the volume name.
   return ((device_name.length() >= 2) && (device_name[1] == L':') &&
       (((device_name[0] >= L'A') && (device_name[0] <= L'Z')) ||
           ((device_name[0] >= L'a') && (device_name[0] <= L'z'))));
 }
 
 // Returns the name of the device specified by |pnp_device_id|.
 string16 GetDeviceNameOnBlockingThread(
     IPortableDeviceManager* portable_device_manager,
@@ skipping 49 matching lines @@
 bool GetDeviceInfoOnBlockingThread(
     IPortableDeviceManager* portable_device_manager,
     const string16& pnp_device_id,
     PortableDeviceWatcherWin::DeviceDetails* device_details) {
   DCHECK(content::BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   DCHECK(portable_device_manager);
   DCHECK(device_details);
   DCHECK(!pnp_device_id.empty());
   device_details->name = GetDeviceNameOnBlockingThread(portable_device_manager,
                                                        pnp_device_id);
-  if (IsVolumeMountedPortableDevice(device_details->name))
+  if (IsMassStoragePortableDevice(pnp_device_id, device_details->name))
     return false;
 
   device_details->location = pnp_device_id;
   PortableDeviceWatcherWin::StorageObjects storage_objects;
   return GetDeviceStorageObjectsOnBlockingThread(
       pnp_device_id, &device_details->storage_objects);
 }
 
 // Wrapper function to get an instance of portable device manager. On success,
 // returns true and fills in |portable_device_mgr|. On failure, returns false.
@@ skipping 222 matching lines @@
     MTPStorageMap::iterator storage_map_iter = storage_map_.find(storage_id);
     DCHECK(storage_map_iter != storage_map_.end());
     system_monitor->ProcessRemovableStorageDetached(
         storage_map_iter->second.device_id);
     storage_map_.erase(storage_map_iter);
   }
   device_map_.erase(device_iter);
 }
 
 }  // namespace chrome