summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 02:12:44 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-12 02:12:44 +0000
commit45afb77f6cf901a879477878f6887d6969551cc8 (patch)
treede19a60bb041a4a2b82b5a51b3f098c992c8b866 /chrome/test
parent63bfb40b91c13a4011efee1e81edf639aa9a8a2d (diff)
downloadchromium_src-45afb77f6cf901a879477878f6887d6969551cc8.zip
chromium_src-45afb77f6cf901a879477878f6887d6969551cc8.tar.gz
chromium_src-45afb77f6cf901a879477878f6887d6969551cc8.tar.bz2
file_manager: Generate volume IDs in VolumeManager
Along the way, add FindVolumeInfoById() which will be used in upcomig patches. BUG=316077 TEST=none R=kinaba@chromium.org Review URL: https://codereview.chromium.org/68463002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/extensions/api_test/file_browser/mount_test/test.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js b/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
index 79db066..741853b 100644
--- a/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
@@ -4,7 +4,7 @@
// These have to be sync'd with file_browser_private_apitest.cc
var expectedVolume1 = {
- volumeId: 'id:/removable/mount_path1',
+ volumeId: 'removable:mount_path1',
mountPath: '/removable/mount_path1',
sourcePath: 'device_path1',
volumeType: 'removable',
@@ -13,7 +13,7 @@ var expectedVolume1 = {
};
var expectedVolume2 = {
- volumeId: 'id:/removable/mount_path2',
+ volumeId: 'removable:mount_path2',
mountPath: '/removable/mount_path2',
sourcePath: 'device_path2',
volumeType: 'removable',
@@ -22,7 +22,7 @@ var expectedVolume2 = {
};
var expectedVolume3 = {
- volumeId: 'id:/removable/mount_path3',
+ volumeId: 'removable:mount_path3',
mountPath: '/removable/mount_path3',
sourcePath: 'device_path3',
volumeType: 'removable',
@@ -31,14 +31,14 @@ var expectedVolume3 = {
};
var expectedDownloadsVolume = {
- volumeId: 'id:/Downloads',
+ volumeId: 'downloads:Downloads',
mountPath: '/Downloads',
volumeType: 'downloads',
isReadOnly: false
};
var expectedDriveVolume = {
- volumeId: 'id:/drive',
+ volumeId: 'drive:drive',
mountPath: '/drive',
sourcePath: '/special/drive',
volumeType: 'drive',
@@ -46,7 +46,7 @@ var expectedDriveVolume = {
};
var expectedArchiveVolume = {
- volumeId: 'id:/archive/archive_mount_path',
+ volumeId: 'archive:archive_mount_path',
mountPath: '/archive/archive_mount_path',
sourcePath: 'archive_path',
volumeType: 'archive',