Improve the device type constants.

chrome/browser/media_gallery/media_device_notifications_window_win_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.
 
 #include "chrome/browser/media_gallery/media_device_notifications_window_win.h"
 
 #include <dbt.h>
 
 #include <string>
 #include <vector>
@@ skipping 85 matching lines @@
   {
     testing::InSequence sequence;
     for (std::vector<int>::const_iterator it = device_indices.begin();
          it != device_indices.end();
          ++it) {
       volume_broadcast.dbcv_unitmask |= 0x1 << *it;
       std::wstring drive(L"_:\\");
       drive[0] = 'A' + *it;
       FilePath::StringType name = L"V" + drive;
       std::string device_id = MediaStorageUtil::MakeDeviceId(
-          MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM, base::IntToString(*it));
+          MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM,
+          base::IntToString(*it));
       EXPECT_CALL(observer_, OnRemovableStorageAttached(device_id, name, drive))
           .Times(0);
     }
   }
   window_->OnDeviceChange(DBT_DEVICEARRIVAL,
                           reinterpret_cast<DWORD>(&volume_broadcast));
   message_loop_.RunAllPending();
 }
 
 void MediaDeviceNotificationsWindowWinTest::DoDevicesDetachedTest(
     const std::vector<int>& device_indices) {
   DEV_BROADCAST_VOLUME volume_broadcast;
   volume_broadcast.dbcv_size = sizeof(volume_broadcast);
   volume_broadcast.dbcv_devicetype = DBT_DEVTYP_VOLUME;
   volume_broadcast.dbcv_unitmask = 0x0;
   volume_broadcast.dbcv_flags = 0x0;
   {
     testing::InSequence sequence;
     for (std::vector<int>::const_iterator it = device_indices.begin();
          it != device_indices.end();
          ++it) {
       volume_broadcast.dbcv_unitmask |= 0x1 << *it;
       std::string device_id = MediaStorageUtil::MakeDeviceId(
-          MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM, base::IntToString(*it));
+          MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM,
+          base::IntToString(*it));
       EXPECT_CALL(observer_, OnRemovableStorageDetached(device_id)).Times(0);
     }
   }
   window_->OnDeviceChange(DBT_DEVICEREMOVECOMPLETE,
                           reinterpret_cast<DWORD>(&volume_broadcast));
   message_loop_.RunAllPending();
 }
 
 TEST_F(MediaDeviceNotificationsWindowWinTest, RandomMessage) {
   window_->OnDeviceChange(DBT_DEVICEQUERYREMOVE, NULL);
@@ skipping 60 matching lines @@
   std::vector<int> device_indices;
   device_indices.push_back(0);
   device_indices.push_back(1);
   device_indices.push_back(2);
   device_indices.push_back(3);
 
   DoDevicesDetachedTest(device_indices);
 }
 
 }  // namespace chrome