Make FileSystemContext respect StoragePartitions. filesystem:// urls will be properly isolated

chrome/browser/chromeos/extensions/file_browser_handler_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.
 
 // The file contains the implementation of
 // fileBrowserHandlerInternal.selectFile extension function.
 // When invoked, the function does the following:
 //  - Verifies that the extension function was invoked as a result of user
 //    gesture.
 //  - Display 'save as' dialog using FileSelectorImpl which waits for the user
@@ skipping 36 matching lines @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/extensions/api/file_browser_handler_internal.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/storage_partition.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "ui/base/dialogs/select_file_dialog.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 using extensions::api::file_browser_handler_internal::FileEntryInfo;
 using file_handler::FileSelector;
 using file_handler::FileSelectorFactory;
@@ skipping 219 matching lines @@
     const FilePath& full_path) {
   if (!success) {
     Respond(false);
     return;
   }
 
   full_path_ = full_path;
 
   // We have to open file system in order to create a FileEntry object for the
   // selected file path.
-  BrowserContext::GetFileSystemContext(profile_)->OpenFileSystem(
-      source_url_.GetOrigin(), fileapi::kFileSystemTypeExternal, false,
-      base::Bind(&RunOpenFileSystemCallback,
-          base::Bind(&FileHandlerSelectFileFunction::OnFileSystemOpened,
-                     this)));
+  BrowserContext::GetDefaultStoragePartition(profile_)->
+      GetFileSystemContext()->OpenFileSystem(
+          source_url_.GetOrigin(), fileapi::kFileSystemTypeExternal, false,
+          base::Bind(
+              &RunOpenFileSystemCallback,
+              base::Bind(&FileHandlerSelectFileFunction::OnFileSystemOpened,
+                         this)));
 };
 
 void FileHandlerSelectFileFunction::OnFileSystemOpened(
     bool success,
     const std::string& file_system_name,
     const GURL& file_system_root) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!success) {
     Respond(false);
     return;
   }
 
   // Remember opened file system's parameters.
   file_system_name_ = file_system_name;
   file_system_root_ = file_system_root;
 
   GrantPermissions();
 }
 
 void FileHandlerSelectFileFunction::GrantPermissions() {
   fileapi::ExternalFileSystemMountPointProvider* external_provider =
-      BrowserContext::GetFileSystemContext(profile_)->external_provider();
+      BrowserContext::GetDefaultStoragePartition(profile_)->
+      GetFileSystemContext()->external_provider();
   DCHECK(external_provider);
 
   external_provider->GetVirtualPath(full_path_, &virtual_path_);
   DCHECK(!virtual_path_.empty());
 
   // Grant access to this particular file to target extension. This will
   // ensure that the target extension can access only this FS entry and
   // prevent from traversing FS hierarchy upward.
   external_provider->GrantFileAccessToExtension(extension_id(), virtual_path_);
 
@@ skipping 47 matching lines @@
     result->entry.reset(new FileEntryInfo());
     result->entry->file_system_name = file_system_name_;
     result->entry->file_system_root = file_system_root_.spec();
     result->entry->file_full_path = "/" + virtual_path_.value();
     result->entry->file_is_directory = false;
   }
 
   results_ = SelectFile::Results::Create(*result);
   SendResponse(true);
 }