OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/stl_util.h" | 5 #include "base/stl_util.h" |
6 #include "chrome/browser/chromeos/file_manager/drive_test_util.h" | 6 #include "chrome/browser/chromeos/file_manager/drive_test_util.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chromeos/dbus/cros_disks_client.h" | 8 #include "chromeos/dbus/cros_disks_client.h" |
9 #include "chromeos/disks/mock_disk_mount_manager.h" | 9 #include "chromeos/disks/mock_disk_mount_manager.h" |
10 | 10 |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 }, | 166 }, |
167 { | 167 { |
168 "device_path3", | 168 "device_path3", |
169 chromeos::CrosDisksClient::GetRemovableDiskMountPoint().AppendASCII( | 169 chromeos::CrosDisksClient::GetRemovableDiskMountPoint().AppendASCII( |
170 "mount_path3").AsUTF8Unsafe(), | 170 "mount_path3").AsUTF8Unsafe(), |
171 chromeos::MOUNT_TYPE_DEVICE, | 171 chromeos::MOUNT_TYPE_DEVICE, |
172 chromeos::disks::MOUNT_CONDITION_NONE, | 172 chromeos::disks::MOUNT_CONDITION_NONE, |
173 2 | 173 2 |
174 }, | 174 }, |
175 { | 175 { |
176 "archive_path", | 176 // Set source path inside another mounted volume. |
| 177 chromeos::CrosDisksClient::GetRemovableDiskMountPoint().AppendASCII( |
| 178 "mount_path3/archive.zip").AsUTF8Unsafe(), |
177 chromeos::CrosDisksClient::GetArchiveMountPoint().AppendASCII( | 179 chromeos::CrosDisksClient::GetArchiveMountPoint().AppendASCII( |
178 "archive_mount_path").AsUTF8Unsafe(), | 180 "archive_mount_path").AsUTF8Unsafe(), |
179 chromeos::MOUNT_TYPE_ARCHIVE, | 181 chromeos::MOUNT_TYPE_ARCHIVE, |
180 chromeos::disks::MOUNT_CONDITION_NONE, | 182 chromeos::disks::MOUNT_CONDITION_NONE, |
181 -1 | 183 -1 |
182 } | 184 } |
183 }; | 185 }; |
184 | 186 |
185 for (size_t i = 0; i < arraysize(kTestMountPoints); i++) { | 187 for (size_t i = 0; i < arraysize(kTestMountPoints); i++) { |
186 mount_points_.insert(DiskMountManager::MountPointMap::value_type( | 188 mount_points_.insert(DiskMountManager::MountPointMap::value_type( |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 .Times(0); | 249 .Times(0); |
248 EXPECT_CALL(*disk_mount_manager_mock_, | 250 EXPECT_CALL(*disk_mount_manager_mock_, |
249 UnmountPath( | 251 UnmountPath( |
250 chromeos::CrosDisksClient::GetArchiveMountPoint().AppendASCII( | 252 chromeos::CrosDisksClient::GetArchiveMountPoint().AppendASCII( |
251 "archive_mount_path").AsUTF8Unsafe(), | 253 "archive_mount_path").AsUTF8Unsafe(), |
252 chromeos::UNMOUNT_OPTIONS_NONE, _)).Times(1); | 254 chromeos::UNMOUNT_OPTIONS_NONE, _)).Times(1); |
253 | 255 |
254 ASSERT_TRUE(RunComponentExtensionTest("file_browser/mount_test")) | 256 ASSERT_TRUE(RunComponentExtensionTest("file_browser/mount_test")) |
255 << message_; | 257 << message_; |
256 } | 258 } |
OLD | NEW |