Revert 282890 "[fsp] Add an option for mounting in R/W mode."

trunk/src/chrome/browser/chromeos/file_system_provider/service_unittest.cc

Index: trunk/src/chrome/browser/chromeos/file_system_provider/service_unittest.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/file_system_provider/service_unittest.cc	(revision 282899)
+++ trunk/src/chrome/browser/chromeos/file_system_provider/service_unittest.cc	(working copy)
@@ -100,8 +100,7 @@
 void RememberFakeFileSystem(TestingProfile* profile,
                             const std::string& extension_id,
                             const std::string& file_system_id,
-                            const std::string& display_name,
-                            bool writable) {
+                            const std::string& display_name) {
   TestingPrefServiceSyncable* const pref_service =
       profile->GetTestingPrefService();
   ASSERT_TRUE(pref_service);
@@ -112,7 +111,6 @@
   file_system->SetStringWithoutPathExpansion(kPrefKeyFileSystemId,
                                              kFileSystemId);
   file_system->SetStringWithoutPathExpansion(kPrefKeyDisplayName, kDisplayName);
-  file_system->SetBooleanWithoutPathExpansion(kPrefKeyWritable, writable);
   file_systems->SetWithoutPathExpansion(kFileSystemId, file_system);
   extensions.SetWithoutPathExpansion(kExtensionId, file_systems);
 
@@ -152,8 +150,8 @@
   LoggingObserver observer;
   service_->AddObserver(&observer);
 
-  EXPECT_TRUE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
+  EXPECT_TRUE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
 
   ASSERT_EQ(1u, observer.mounts.size());
   EXPECT_EQ(kExtensionId, observer.mounts[0].file_system_info().extension_id());
@@ -164,7 +162,6 @@
   EXPECT_EQ(expected_mount_path.AsUTF8Unsafe(),
             observer.mounts[0].file_system_info().mount_path().AsUTF8Unsafe());
   EXPECT_EQ(kDisplayName, observer.mounts[0].file_system_info().display_name());
-  EXPECT_FALSE(observer.mounts[0].file_system_info().writable());
   EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
   ASSERT_EQ(0u, observer.unmounts.size());
 
@@ -175,31 +172,14 @@
   service_->RemoveObserver(&observer);
 }
 
-TEST_F(FileSystemProviderServiceTest, MountFileSystem_Writable) {
-  LoggingObserver observer;
-  service_->AddObserver(&observer);
-
-  EXPECT_TRUE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, true /* writable */));
-
-  ASSERT_EQ(1u, observer.mounts.size());
-  EXPECT_TRUE(observer.mounts[0].file_system_info().writable());
-  ASSERT_EQ(0u, observer.unmounts.size());
-  std::vector<ProvidedFileSystemInfo> file_system_info_list =
-      service_->GetProvidedFileSystemInfoList();
-  ASSERT_EQ(1u, file_system_info_list.size());
-
-  service_->RemoveObserver(&observer);
-}
-
 TEST_F(FileSystemProviderServiceTest, MountFileSystem_UniqueIds) {
   LoggingObserver observer;
   service_->AddObserver(&observer);
 
-  EXPECT_TRUE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
-  EXPECT_FALSE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
+  EXPECT_TRUE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
+  EXPECT_FALSE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
 
   ASSERT_EQ(2u, observer.mounts.size());
   EXPECT_EQ(base::File::FILE_OK, observer.mounts[0].error());
@@ -220,14 +200,14 @@
   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 */));
+    EXPECT_TRUE(
+        service_->MountFileSystem(kExtensionId, 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 */));
+  EXPECT_FALSE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
 
   ASSERT_EQ(kMaxFileSystems + 1, observer.mounts.size());
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED,
@@ -244,8 +224,8 @@
   LoggingObserver observer;
   service_->AddObserver(&observer);
 
-  EXPECT_TRUE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
+  EXPECT_TRUE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
   ASSERT_EQ(1u, observer.mounts.size());
 
   EXPECT_TRUE(service_->UnmountFileSystem(
@@ -269,8 +249,8 @@
   LoggingObserver observer;
   service_->AddObserver(&observer);
 
-  EXPECT_TRUE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
+  EXPECT_TRUE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
   ASSERT_EQ(1u, observer.mounts.size());
 
   // Directly call the observer's method.
@@ -300,8 +280,8 @@
 
   const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe";
 
-  EXPECT_TRUE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
+  EXPECT_TRUE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
   ASSERT_EQ(1u, observer.mounts.size());
   ASSERT_EQ(1u, service_->GetProvidedFileSystemInfoList().size());
 
@@ -320,11 +300,8 @@
 
 TEST_F(FileSystemProviderServiceTest, RestoreFileSystem_OnExtensionLoad) {
   // Create a fake entry in the preferences.
-  RememberFakeFileSystem(profile_.get(),
-                         kExtensionId,
-                         kFileSystemId,
-                         kDisplayName,
-                         true /* writable */);
+  RememberFakeFileSystem(
+      profile_.get(), kExtensionId, kFileSystemId, kDisplayName);
 
   // Create a new service instance in order to load remembered file systems
   // from preferences.
@@ -347,7 +324,6 @@
   EXPECT_EQ(kExtensionId, observer.mounts[0].file_system_info().extension_id());
   EXPECT_EQ(kFileSystemId,
             observer.mounts[0].file_system_info().file_system_id());
-  EXPECT_TRUE(observer.mounts[0].file_system_info().writable());
 
   std::vector<ProvidedFileSystemInfo> file_system_info_list =
       new_service->GetProvidedFileSystemInfoList();
@@ -360,8 +336,8 @@
   LoggingObserver observer;
   service_->AddObserver(&observer);
 
-  EXPECT_TRUE(service_->MountFileSystem(
-      kExtensionId, kFileSystemId, kDisplayName, true /* writable */));
+  EXPECT_TRUE(
+      service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
   ASSERT_EQ(1u, observer.mounts.size());
 
   TestingPrefServiceSyncable* const pref_service =
@@ -393,11 +369,6 @@
                                                          &display_name));
   EXPECT_EQ(kDisplayName, display_name);
 
-  bool writable = false;
-  EXPECT_TRUE(
-      file_system->GetBooleanWithoutPathExpansion(kPrefKeyWritable, &writable));
-  EXPECT_TRUE(writable);
-
   service_->RemoveObserver(&observer);
 }
 
@@ -410,8 +381,8 @@
   ASSERT_TRUE(pref_service);
 
   {
-    EXPECT_TRUE(service_->MountFileSystem(
-        kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
+    EXPECT_TRUE(
+        service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
     ASSERT_EQ(1u, observer.mounts.size());
 
     const base::DictionaryValue* extensions =
@@ -450,8 +421,8 @@
   ASSERT_TRUE(pref_service);
 
   {
-    EXPECT_TRUE(service_->MountFileSystem(
-        kExtensionId, kFileSystemId, kDisplayName, false /* writable */));
+    EXPECT_TRUE(
+        service_->MountFileSystem(kExtensionId, kFileSystemId, kDisplayName));
     ASSERT_EQ(1u, observer.mounts.size());
 
     const base::DictionaryValue* extensions =