Make isolated file system works for a device root (e.g. X:\\)

chrome/browser/extensions/api/file_system/file_system_api.cc

 // Copyright (c) 2012 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/extensions/api/file_system/file_system_api.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/browser/ui/select_file_dialog.h"
 #include "chrome/common/extensions/api/file_system.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/isolated_context.h"
 
+using fileapi::IsolatedContext;
+
 const char kInvalidParameters[] = "Invalid parameters";
 const char kSecurityError[] = "Security error";
 const char kInvalidCallingPage[] = "Invalid calling page";
 const char kUserCancelled[] = "User cancelled";
 const char kWritableFileError[] = "Invalid file for writing";
 
 const char kSaveFileOption[] = "saveFile";
 
 namespace file_system = extensions::api::file_system;
 namespace ChooseFile = file_system::ChooseFile;
@@ skipping 17 matching lines @@
   // Only return the display path if the process has read access to the
   // filesystem.
   content::ChildProcessSecurityPolicy* policy =
       content::ChildProcessSecurityPolicy::GetInstance();
   if (!policy->CanReadFileSystem(render_view_host->GetProcess()->GetID(),
                                  filesystem_id)) {
     *error = kSecurityError;
     return false;
   }
 
-  fileapi::IsolatedContext* context = fileapi::IsolatedContext::GetInstance();
+  IsolatedContext* context = IsolatedContext::GetInstance();
   FilePath relative_path = FilePath::FromUTF8Unsafe(filesystem_path);
-  FilePath virtual_path = context->CreateVirtualPath(filesystem_id,
-                                                     relative_path);
+  FilePath virtual_path = context->CreateVirtualRootPath(filesystem_id)
+      .Append(relative_path);
   if (!context->CrackIsolatedPath(virtual_path,
                                   &filesystem_id,
                                   NULL,
                                   file_path)) {
     *error = kInvalidParameters;
     return false;
   }
 
   return true;
 }
@@ skipping 172 matching lines @@
     return;
   }
 
   content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
       base::Bind(&FileSystemPickerFunction::HandleWritableFileError, this));
 }
 
 void FileSystemPickerFunction::RegisterFileSystemAndSendResponse(
     const FilePath& path, bool for_save) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  std::set<FilePath> filesets;
-  filesets.insert(path);
 
-  fileapi::IsolatedContext* isolated_context =
-      fileapi::IsolatedContext::GetInstance();
+  IsolatedContext* isolated_context = IsolatedContext::GetInstance();
+  std::string file_name = IsolatedContext::GetNameForPath(path);
+
   DCHECK(isolated_context);
-  std::string filesystem_id = isolated_context->RegisterIsolatedFileSystem(
-      filesets);
+  std::string filesystem_id = isolated_context->RegisterFileSystemForFile(
+      file_name, path);
 
   content::ChildProcessSecurityPolicy* policy =
       content::ChildProcessSecurityPolicy::GetInstance();
   int renderer_id = render_view_host_->GetProcess()->GetID();
   if (for_save)
     policy->GrantReadWriteFileSystem(renderer_id, filesystem_id);
   else
     policy->GrantReadFileSystem(renderer_id, filesystem_id);
 
   // We only need file level access for reading FileEntries. Saving FileEntries
   // just needs the file system to have read/write access, which is granted
   // above if required.
   if (!policy->CanReadFile(renderer_id, path))
     policy->GrantReadFile(renderer_id, path);
 
   DictionaryValue* dict = new DictionaryValue();
   result_.reset(dict);
   dict->SetString("fileSystemId", filesystem_id);
-  dict->SetString("baseName", path.BaseName().AsUTF8Unsafe());
+  dict->SetString("baseName", file_name);
   SendResponse(true);
 }
 
 void FileSystemPickerFunction::HandleWritableFileError() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   error_ = kWritableFileError;
   SendResponse(false);
 }
 
 bool FileSystemGetWritableFileEntryFunction::RunImpl() {
@@ skipping 19 matching lines @@
   file_system::ChooseFileOptions* options = params->options.get();
   if (options) {
     if (options->type.get() &&  *options->type == kSaveFileOption)
       for_save = true;
   }
 
   return ShowPicker(FilePath(), for_save);
 }
 
 }  // namespace extensions