Improve the device type constants.

chrome/browser/media_gallery/media_device_notifications_window_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.
 
 #include "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 
 #include <windows.h>
 #include <dbt.h>
 
 #include <string>
@@ skipping 86 matching lines @@
       DWORD unitmask = GetVolumeBitMaskFromBroadcastHeader(data);
       for (int i = 0; unitmask; ++i, unitmask >>= 1) {
         if (unitmask & 0x01) {
           FilePath::StringType drive(L"_:\\");
           drive[0] = L'A' + i;
           WCHAR volume_name[MAX_PATH + 1];
           if ((*volume_name_func_)(drive.c_str(), volume_name, MAX_PATH + 1)) {
             // TODO(kmadhusu) We need to look up a real device id as well as
             // having a fall back for volume name.
             std::string device_id = MediaStorageUtil::MakeDeviceId(
-                MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM,
+                MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM,
                 base::IntToString(i));
             BrowserThread::PostTask(
                 BrowserThread::FILE, FROM_HERE,
                 base::Bind(&MediaDeviceNotificationsWindowWin::
                     CheckDeviceTypeOnFileThread, this, device_id,
                     FilePath::StringType(volume_name), FilePath(drive)));
           }
         }
       }
       break;
     }
     case DBT_DEVICEREMOVECOMPLETE: {
       DWORD unitmask = GetVolumeBitMaskFromBroadcastHeader(data);
       for (int i = 0; unitmask; ++i, unitmask >>= 1) {
         if (unitmask & 0x01) {
           std::string device_id = MediaStorageUtil::MakeDeviceId(
-              MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM,
+              MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM,
               base::IntToString(i));
           SystemMonitor::Get()->ProcessRemovableStorageDetached(device_id);
         }
       }
       break;
     }
   }
   return TRUE;
 }
 
@@ skipping 45 matching lines @@
     LPARAM lparam) {
   MediaDeviceNotificationsWindowWin* msg_wnd =
       reinterpret_cast<MediaDeviceNotificationsWindowWin*>(
           GetWindowLongPtr(hwnd, GWLP_USERDATA));
   if (msg_wnd)
     return msg_wnd->WndProc(hwnd, message, wparam, lparam);
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
 }  // namespace chrome