Improve the device type constants.

chrome/browser/media_gallery/media_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.
 
 // MediaDeviceNotificationsLinux unit tests.
 
 #include "chrome/browser/media_gallery/media_device_notifications_linux.h"
 
 #include <mntent.h>
 #include <stdio.h>
@@ skipping 33 matching lines @@
 
 const char kDeviceLabel1[] = "TEST_USB_MODEL_1";
 const char kDeviceLabel2[] = "TEST_USB_MODEL_2";
 const char kDeviceLabel3[] = "TEST_USB_MODEL_3";
 
 const char kMountPointA[] = "mnt_a";
 const char kMountPointB[] = "mnt_b";
 
 std::string GetDCIMDeviceId(std::string unique_id) {
   return chrome::MediaStorageUtil::MakeDeviceId(
-      chrome::MediaStorageUtil::USB_MASS_STORAGE_WITH_DCIM, unique_id);
+      chrome::MediaStorageUtil::REMOVABLE_MASS_STORAGE_WITH_DCIM, unique_id);
 }
 
 bool GetDeviceInfo(const std::string& dev_path, std::string* id,
                    string16* name) {
   std::string device_name;
   if (dev_path == kDevice1) {
     *id = GetDCIMDeviceId(kDeviceId1);
     device_name = kDeviceLabel1;
   } else if (dev_path == kDevice2) {
     *id = GetDCIMDeviceId(kDeviceId2);
@@ skipping 405 matching lines @@
   EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   EXPECT_CALL(observer(),
               OnRemovableStorageDetached(GetDCIMDeviceId(kDeviceId3)))
       .Times(1);
   WriteEmptyMtabAndRunLoop();
 }
 
 }  // namespace
 
 }  // namespace chrome