Improve the device type constants.

chrome/browser/media_gallery/media_device_notifications_chromeos_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.
 
 // chromeos::MediaDeviceNotifications unit tests.
 
 #include "chrome/browser/media_gallery/media_device_notifications_chromeos.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 
 const char kDevice1[] = "/dev/d1";
 const char kDevice2[] = "/dev/disk/d2";
 const char kDevice1Name[] = "d1";
 const char kDevice2Name[] = "d2";
 const char kMountPointA[] = "mnt_a";
 const char kMountPointB[] = "mnt_b";
 
 std::string GetDCIMDeviceId(const 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);
 }
 
 class MediaDeviceNotificationsTest : public testing::Test {
  public:
   MediaDeviceNotificationsTest()
       : ui_thread_(BrowserThread::UI, &ui_loop_),
         file_thread_(BrowserThread::FILE) {
   }
   virtual ~MediaDeviceNotificationsTest() {}
 
@@ skipping 182 matching lines @@
   // Unsupported file system.
   mount_info.mount_type = MOUNT_TYPE_DEVICE;
   mount_info.mount_condition = disks::MOUNT_CONDITION_UNSUPPORTED_FILESYSTEM;
   EXPECT_CALL(observer(), OnRemovableStorageAttached(_, _, _)).Times(0);
   MountDevice(MOUNT_ERROR_NONE, mount_info, kUniqueId);
 }
 
 }  // namespace
 
 }  // namespace chrome