Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/file_system_provider/service_unittest.cc

Issue 624903002: [fsp] Group arguments for mounting into a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed a bug. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a2bdc50fcf04531e55284ec5e4f07936dd455a6a..91643d3d6adbbaca673b8a1d0d16731ab2d60d0a 100644
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -162,11 +162,8 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem) {
LoggingObserver observer;
service_->AddObserver(&observer);
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(1u, observer.mounts.size());
EXPECT_EQ(kExtensionId, observer.mounts[0].file_system_info().extension_id());
@@ -194,11 +191,10 @@ TEST_F(FileSystemProviderServiceTest,
LoggingObserver observer;
service_->AddObserver(&observer);
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- true /* writable */,
- true /* supports_notify_tag */));
+ MountOptions options(kFileSystemId, kDisplayName);
+ options.writable = true;
+ options.supports_notify_tag = true;
+ EXPECT_TRUE(service_->MountFileSystem(kExtensionId, options));
ASSERT_EQ(1u, observer.mounts.size());
EXPECT_TRUE(observer.mounts[0].file_system_info().writable());
@@ -215,16 +211,10 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
LoggingObserver observer;
service_->AddObserver(&observer);
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
- EXPECT_FALSE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
+ EXPECT_FALSE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(2u, observer.mounts.size());
EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
@@ -245,20 +235,14 @@ TEST_F(FileSystemProviderServiceTest, MountFileSystem_StressTest) {
for (size_t i = 0; i < kMaxFileSystems; ++i) {
const std::string file_system_id =
std::string("test-") + base::IntToString(i);
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- file_system_id,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(file_system_id, kDisplayName)));
}
ASSERT_EQ(kMaxFileSystems, observer.mounts.size());
// The next file system is out of limit, and registering it should fail.
- EXPECT_FALSE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_FALSE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(kMaxFileSystems + 1, observer.mounts.size());
EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED,
@@ -275,11 +259,8 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem) {
LoggingObserver observer;
service_->AddObserver(&observer);
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(1u, observer.mounts.size());
EXPECT_TRUE(service_->UnmountFileSystem(
@@ -303,11 +284,8 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_OnExtensionUnload) {
LoggingObserver observer;
service_->AddObserver(&observer);
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(1u, observer.mounts.size());
// Directly call the observer's method.
@@ -337,11 +315,8 @@ TEST_F(FileSystemProviderServiceTest, UnmountFileSystem_WrongExtensionId) {
const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe";
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(1u, observer.mounts.size());
ASSERT_EQ(1u, service_->GetProvidedFileSystemInfoList().size());
@@ -402,11 +377,10 @@ TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnMount) {
LoggingObserver observer;
service_->AddObserver(&observer);
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- true /* writable */,
- true /* supports_notify_tag */));
+ MountOptions options(kFileSystemId, kDisplayName);
+ options.writable = true;
+ options.supports_notify_tag = true;
+ EXPECT_TRUE(service_->MountFileSystem(kExtensionId, options));
ASSERT_EQ(1u, observer.mounts.size());
TestingPrefServiceSyncable* const pref_service =
@@ -460,11 +434,8 @@ TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountOnShutdown) {
ASSERT_TRUE(pref_service);
{
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(1u, observer.mounts.size());
const base::DictionaryValue* extensions =
@@ -503,11 +474,8 @@ TEST_F(FileSystemProviderServiceTest, RememberFileSystem_OnUnmountByUser) {
ASSERT_TRUE(pref_service);
{
- EXPECT_TRUE(service_->MountFileSystem(kExtensionId,
- kFileSystemId,
- kDisplayName,
- false /* writable */,
- false /* supports_notify_tag */));
+ EXPECT_TRUE(service_->MountFileSystem(
+ kExtensionId, MountOptions(kFileSystemId, kDisplayName)));
ASSERT_EQ(1u, observer.mounts.size());
const base::DictionaryValue* extensions =
« no previous file with comments | « chrome/browser/chromeos/file_system_provider/service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698