Revert 282900 "Revert 282890 "[fsp] Add an option for mounting i..."

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/file_system_provider/service.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/stl_util.h"
@@ skipping 21 matching lines @@
     Profile* profile,
     const ProvidedFileSystemInfo& file_system_info) {
   DCHECK(profile);
   return new ProvidedFileSystem(profile, file_system_info);
 }
 
 }  // namespace
 
 const char kPrefKeyFileSystemId[] = "file-system-id";
 const char kPrefKeyDisplayName[] = "display-name";
+const char kPrefKeyWritable[] = "writable";
 
 void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterDictionaryPref(
       prefs::kFileSystemProviderMounted,
       user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 Service::Service(Profile* profile,
                  extensions::ExtensionRegistry* extension_registry)
     : profile_(profile),
@@ skipping 42 matching lines @@
 }
 
 void Service::SetFileSystemFactoryForTesting(
     const FileSystemFactoryCallback& factory_callback) {
   DCHECK(!factory_callback.is_null());
   file_system_factory_ = factory_callback;
 }
 
 bool Service::MountFileSystem(const std::string& extension_id,
                               const std::string& file_system_id,
-                              const std::string& display_name) {
+                              const std::string& display_name,
+                              bool writable) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // If already exists a file system provided by the same extension with this
   // id, then abort.
   if (GetProvidedFileSystem(extension_id, file_system_id)) {
     FOR_EACH_OBSERVER(Observer,
                       observers_,
                       OnProvidedFileSystemMount(ProvidedFileSystemInfo(),
                                                 base::File::FILE_ERROR_EXISTS));
     return false;
@@ skipping 27 matching lines @@
         Observer,
         observers_,
         OnProvidedFileSystemMount(ProvidedFileSystemInfo(),
                                   base::File::FILE_ERROR_INVALID_OPERATION));
     return false;
   }
 
   // Store the file system descriptor. Use the mount point name as the file
   // system provider file system id.
   // Examples:
-  //   file_system_id = 41
-  //   mount_point_name =  b33f1337-41-5aa5
-  //   mount_path = /provided/b33f1337-41-5aa5
+  //   file_system_id = hello_world
+  //   mount_point_name =  b33f1337-hello_world-5aa5
+  //   writable = false
+  //   mount_path = /provided/b33f1337-hello_world-5aa5
   ProvidedFileSystemInfo file_system_info(
-      extension_id, file_system_id, display_name, mount_path);
+      extension_id, file_system_id, display_name, writable, mount_path);
 
   ProvidedFileSystemInterface* file_system =
       file_system_factory_.Run(profile_, file_system_info);
   DCHECK(file_system);
   file_system_map_[FileSystemKey(extension_id, file_system_id)] = file_system;
   mount_point_name_to_key_map_[mount_point_name] =
       FileSystemKey(extension_id, file_system_id);
   RememberFileSystem(file_system_info);
 
   FOR_EACH_OBSERVER(
@@ skipping 157 matching lines @@
   }
 }
 
 void Service::RememberFileSystem(
     const ProvidedFileSystemInfo& file_system_info) {
   base::DictionaryValue* file_system = new base::DictionaryValue();
   file_system->SetStringWithoutPathExpansion(kPrefKeyFileSystemId,
                                              file_system_info.file_system_id());
   file_system->SetStringWithoutPathExpansion(kPrefKeyDisplayName,
                                              file_system_info.display_name());
+  file_system->SetBooleanWithoutPathExpansion(kPrefKeyWritable,
+                                              file_system_info.writable());
 
   PrefService* const pref_service = profile_->GetPrefs();
   DCHECK(pref_service);
 
   DictionaryPrefUpdate dict_update(pref_service,
                                    prefs::kFileSystemProviderMounted);
 
   base::DictionaryValue* file_systems_per_extension = NULL;
   if (!dict_update->GetDictionaryWithoutPathExpansion(
           file_system_info.extension_id(), &file_systems_per_extension)) {
@@ skipping 46 matching lines @@
        !it.IsAtEnd();
        it.Advance()) {
     const base::Value* file_system_value = NULL;
     const base::DictionaryValue* file_system = NULL;
     file_systems_per_extension_copy->GetWithoutPathExpansion(
         it.key(), &file_system_value);
     DCHECK(file_system_value);
 
     std::string file_system_id;
     std::string display_name;
-    if (file_system_value->GetAsDictionary(&file_system)) {
-      file_system->GetStringWithoutPathExpansion(kPrefKeyFileSystemId,
-                                                 &file_system_id);
-      file_system->GetStringWithoutPathExpansion(kPrefKeyDisplayName,
-                                                 &display_name);
-    }
+    bool writable;
 
-    if (file_system_id.empty() || display_name.empty()) {
+    if (!file_system_value->GetAsDictionary(&file_system) ||
+        !file_system->GetStringWithoutPathExpansion(kPrefKeyFileSystemId,
+                                                    &file_system_id) ||
+        !file_system->GetStringWithoutPathExpansion(kPrefKeyDisplayName,
+                                                    &display_name) ||
+        !file_system->GetBooleanWithoutPathExpansion(kPrefKeyWritable,
+                                                     &writable) ||
+        file_system_id.empty() || display_name.empty()) {
       LOG(ERROR)
           << "Malformed provided file system information in preferences.";
       continue;
     }
 
     const bool result =
-        MountFileSystem(extension_id, file_system_id, display_name);
+        MountFileSystem(extension_id, file_system_id, display_name, writable);
     if (!result) {
       LOG(ERROR) << "Failed to restore a provided file system from "
                  << "preferences: " << extension_id << ", " << file_system_id
                  << ", " << display_name << ".";
       // Since remounting of the file system failed, then remove it from
       // preferences to avoid remounting it over and over again with a failure.
       ForgetFileSystem(extension_id, file_system_id);
     }
   }
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos