| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 #include <stdint.h> | 6 #include <stdint.h> |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 const std::string& source_path) { | 302 const std::string& source_path) { |
| 303 DiskMountManager::DiskMap::const_iterator volume_it = | 303 DiskMountManager::DiskMap::const_iterator volume_it = |
| 304 volumes_.find(source_path); | 304 volumes_.find(source_path); |
| 305 return (volume_it == volumes_.end()) ? NULL : volume_it->second; | 305 return (volume_it == volumes_.end()) ? NULL : volume_it->second; |
| 306 } | 306 } |
| 307 | 307 |
| 308 protected: | 308 protected: |
| 309 chromeos::disks::MockDiskMountManager* disk_mount_manager_mock_; | 309 chromeos::disks::MockDiskMountManager* disk_mount_manager_mock_; |
| 310 DiskMountManager::DiskMap volumes_; | 310 DiskMountManager::DiskMap volumes_; |
| 311 DiskMountManager::MountPointMap mount_points_; | 311 DiskMountManager::MountPointMap mount_points_; |
| 312 scoped_ptr<TestingProfile> testing_profile_; | 312 std::unique_ptr<TestingProfile> testing_profile_; |
| 313 scoped_ptr<file_manager::EventRouter> event_router_; | 313 std::unique_ptr<file_manager::EventRouter> event_router_; |
| 314 }; | 314 }; |
| 315 | 315 |
| 316 IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, Mount) { | 316 IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, Mount) { |
| 317 file_manager::test_util::WaitUntilDriveMountPointIsAdded( | 317 file_manager::test_util::WaitUntilDriveMountPointIsAdded( |
| 318 browser()->profile()); | 318 browser()->profile()); |
| 319 | 319 |
| 320 // Add a provided file system, to test passing the |configurable| and | 320 // Add a provided file system, to test passing the |configurable| and |
| 321 // |source| flags properly down to Files app. | 321 // |source| flags properly down to Files app. |
| 322 chromeos::file_system_provider::ProvidedFileSystemInfo info( | 322 chromeos::file_system_provider::ProvidedFileSystemInfo info( |
| 323 "testing-extension-id", chromeos::file_system_provider::MountOptions(), | 323 "testing-extension-id", chromeos::file_system_provider::MountOptions(), |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 ->RegisterFileSystem( | 441 ->RegisterFileSystem( |
| 442 kLocalMountPointName, storage::kFileSystemTypeNativeLocal, | 442 kLocalMountPointName, storage::kFileSystemTypeNativeLocal, |
| 443 storage::FileSystemMountOption(), mount_point_dir)); | 443 storage::FileSystemMountOption(), mount_point_dir)); |
| 444 file_manager::VolumeManager::Get(browser()->profile()) | 444 file_manager::VolumeManager::Get(browser()->profile()) |
| 445 ->AddVolumeForTesting(mount_point_dir, file_manager::VOLUME_TYPE_TESTING, | 445 ->AddVolumeForTesting(mount_point_dir, file_manager::VOLUME_TYPE_TESTING, |
| 446 chromeos::DEVICE_TYPE_UNKNOWN, | 446 chromeos::DEVICE_TYPE_UNKNOWN, |
| 447 false /* read_only */); | 447 false /* read_only */); |
| 448 | 448 |
| 449 ASSERT_TRUE(RunComponentExtensionTest("file_browser/content_checksum_test")); | 449 ASSERT_TRUE(RunComponentExtensionTest("file_browser/content_checksum_test")); |
| 450 } | 450 } |
| OLD | NEW |