Index: chrome/browser/chromeos/file_system_provider/service_unittest.cc |
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc |
index d72dd01c4cd6e5f5814790e11c41c4f8b92a434f..38ec2b131f88240b3d5d69aa1032b973bbc8477e 100644 |
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc |
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc |
@@ -7,8 +7,10 @@ |
#include "base/files/file.h" |
#include "base/memory/scoped_ptr.h" |
+#include "chrome/browser/chromeos/file_system_provider/fake_provided_file_system.h" |
+#include "chrome/browser/chromeos/file_system_provider/mount_path_util.h" |
#include "chrome/browser/chromeos/file_system_provider/observer.h" |
-#include "chrome/browser/chromeos/file_system_provider/provided_file_system.h" |
+#include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" |
#include "chrome/browser/chromeos/file_system_provider/service.h" |
#include "chrome/browser/chromeos/login/fake_user_manager.h" |
#include "chrome/test/base/testing_profile.h" |
@@ -28,15 +30,18 @@ class LoggingObserver : public Observer { |
public: |
class Event { |
public: |
- Event(const ProvidedFileSystem& file_system, base::File::Error error) |
- : file_system_(file_system), error_(error) {} |
+ Event(const ProvidedFileSystemInfo& file_system_info, |
+ base::File::Error error) |
+ : file_system_info_(file_system_info), error_(error) {} |
~Event() {} |
- const ProvidedFileSystem& file_system() { return file_system_; } |
+ const ProvidedFileSystemInfo& file_system_info() { |
+ return file_system_info_; |
+ } |
base::File::Error error() { return error_; } |
private: |
- ProvidedFileSystem file_system_; |
+ ProvidedFileSystemInfo file_system_info_; |
base::File::Error error_; |
}; |
@@ -44,15 +49,16 @@ class LoggingObserver : public Observer { |
virtual ~LoggingObserver() {} |
// file_system_provider::Observer overrides. |
- virtual void OnProvidedFileSystemMount(const ProvidedFileSystem& file_system, |
- base::File::Error error) OVERRIDE { |
- mounts.push_back(Event(file_system, error)); |
+ virtual void OnProvidedFileSystemMount( |
+ const ProvidedFileSystemInfo& file_system_info, |
+ base::File::Error error) OVERRIDE { |
+ mounts.push_back(Event(file_system_info, error)); |
} |
virtual void OnProvidedFileSystemUnmount( |
- const ProvidedFileSystem& file_system, |
+ const ProvidedFileSystemInfo& file_system_info, |
base::File::Error error) OVERRIDE { |
- unmounts.push_back(Event(file_system, error)); |
+ unmounts.push_back(Event(file_system_info, error)); |
} |
std::vector<Event> mounts; |
@@ -71,7 +77,10 @@ class FileSystemProviderServiceTest : public testing::Test { |
user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_)); |
profile_.reset(new TestingProfile); |
user_manager_->AddUser(profile_->GetProfileName()); |
- file_system_provider_service_.reset(new Service(profile_.get())); |
+ file_system_provider_service_.reset(Service::CreateForTesting( |
+ profile_.get(), |
+ scoped_ptr<ProvidedFileSystemFactoryInterface>( |
+ new FakeProvidedFileSystemFactory))); |
} |
virtual void TearDown() { |
@@ -94,18 +103,20 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem) { |
EXPECT_LT(0, file_system_id); |
ASSERT_EQ(1u, observer.mounts.size()); |
- EXPECT_EQ(kExtensionId, observer.mounts[0].file_system().extension_id()); |
- EXPECT_EQ(1, observer.mounts[0].file_system().file_system_id()); |
- EXPECT_EQ("/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash", |
- observer.mounts[0].file_system().mount_path().AsUTF8Unsafe()); |
+ EXPECT_EQ(kExtensionId, observer.mounts[0].file_system_info().extension_id()); |
+ EXPECT_EQ(1, observer.mounts[0].file_system_info().file_system_id()); |
+ base::FilePath expected_mount_path = |
+ util::GetMountPointPath(profile_.get(), kExtensionId, file_system_id); |
+ EXPECT_EQ(expected_mount_path.AsUTF8Unsafe(), |
+ observer.mounts[0].file_system_info().mount_path().AsUTF8Unsafe()); |
EXPECT_EQ(kFileSystemName, |
- observer.mounts[0].file_system().file_system_name()); |
+ observer.mounts[0].file_system_info().file_system_name()); |
EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error()); |
ASSERT_EQ(0u, observer.unmounts.size()); |
- std::vector<ProvidedFileSystem> provided_file_systems = |
- file_system_provider_service_->GetMountedFileSystems(); |
- ASSERT_EQ(1u, provided_file_systems.size()); |
+ std::vector<ProvidedFileSystemInfo> file_system_info_list = |
+ file_system_provider_service_->GetProvidedFileSystemInfoList(); |
+ ASSERT_EQ(1u, file_system_info_list.size()); |
file_system_provider_service_->RemoveObserver(&observer); |
} |
@@ -127,9 +138,9 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) { |
EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error()); |
EXPECT_EQ(base::File::FILE_OK, observer.mounts[1].error()); |
- std::vector<ProvidedFileSystem> provided_file_systems = |
- file_system_provider_service_->GetMountedFileSystems(); |
- ASSERT_EQ(2u, provided_file_systems.size()); |
+ std::vector<ProvidedFileSystemInfo> file_system_info_list = |
+ file_system_provider_service_->GetProvidedFileSystemInfoList(); |
+ ASSERT_EQ(2u, file_system_info_list.size()); |
file_system_provider_service_->RemoveObserver(&observer); |
} |
@@ -154,12 +165,10 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) { |
ASSERT_EQ(kMaxFileSystems + 1, observer.mounts.size()); |
EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, |
observer.mounts[kMaxFileSystems].error()); |
- ASSERT_EQ(kMaxFileSystems, |
- file_system_provider_service_->GetMountedFileSystems().size()); |
- std::vector<ProvidedFileSystem> provided_file_systems = |
- file_system_provider_service_->GetMountedFileSystems(); |
- ASSERT_EQ(kMaxFileSystems, provided_file_systems.size()); |
+ std::vector<ProvidedFileSystemInfo> file_system_info_list = |
+ file_system_provider_service_->GetProvidedFileSystemInfoList(); |
+ ASSERT_EQ(kMaxFileSystems, file_system_info_list.size()); |
file_system_provider_service_->RemoveObserver(&observer); |
} |
@@ -179,16 +188,20 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) { |
ASSERT_EQ(1u, observer.unmounts.size()); |
EXPECT_EQ(base::File::FILE_OK, observer.unmounts[0].error()); |
- EXPECT_EQ(kExtensionId, observer.unmounts[0].file_system().extension_id()); |
- EXPECT_EQ(1, observer.unmounts[0].file_system().file_system_id()); |
- EXPECT_EQ("/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash", |
- observer.unmounts[0].file_system().mount_path().AsUTF8Unsafe()); |
+ EXPECT_EQ(kExtensionId, |
+ observer.unmounts[0].file_system_info().extension_id()); |
+ EXPECT_EQ(1, observer.unmounts[0].file_system_info().file_system_id()); |
+ base::FilePath expected_mount_path = |
+ util::GetMountPointPath(profile_.get(), kExtensionId, file_system_id); |
+ EXPECT_EQ( |
+ expected_mount_path.AsUTF8Unsafe(), |
+ observer.unmounts[0].file_system_info().mount_path().AsUTF8Unsafe()); |
EXPECT_EQ(kFileSystemName, |
- observer.unmounts[0].file_system().file_system_name()); |
+ observer.unmounts[0].file_system_info().file_system_name()); |
- std::vector<ProvidedFileSystem> provided_file_systems = |
- file_system_provider_service_->GetMountedFileSystems(); |
- ASSERT_EQ(0u, provided_file_systems.size()); |
+ std::vector<ProvidedFileSystemInfo> file_system_info_list = |
+ file_system_provider_service_->GetProvidedFileSystemInfoList(); |
+ ASSERT_EQ(0u, file_system_info_list.size()); |
file_system_provider_service_->RemoveObserver(&observer); |
} |
@@ -203,18 +216,22 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) { |
kExtensionId, kFileSystemName); |
EXPECT_LT(0, file_system_id); |
ASSERT_EQ(1u, observer.mounts.size()); |
- ASSERT_EQ(1u, file_system_provider_service_->GetMountedFileSystems().size()); |
+ ASSERT_EQ( |
+ 1u, |
+ file_system_provider_service_->GetProvidedFileSystemInfoList().size()); |
const bool result = file_system_provider_service_->UnmountFileSystem( |
kWrongExtensionId, file_system_id); |
EXPECT_FALSE(result); |
ASSERT_EQ(1u, observer.unmounts.size()); |
EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, observer.unmounts[0].error()); |
- ASSERT_EQ(1u, file_system_provider_service_->GetMountedFileSystems().size()); |
+ ASSERT_EQ( |
+ 1u, |
+ file_system_provider_service_->GetProvidedFileSystemInfoList().size()); |
- std::vector<ProvidedFileSystem> provided_file_systems = |
- file_system_provider_service_->GetMountedFileSystems(); |
- ASSERT_EQ(1u, provided_file_systems.size()); |
+ std::vector<ProvidedFileSystemInfo> file_system_info_list = |
+ file_system_provider_service_->GetProvidedFileSystemInfoList(); |
+ ASSERT_EQ(1u, file_system_info_list.size()); |
file_system_provider_service_->RemoveObserver(&observer); |
} |