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

chrome/browser/chromeos/extensions/file_browser_private_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/chromeos/extensions/file_browser_private_api.h"
 
 #include <sys/statvfs.h>
 #include <utility>
 
 #include "base/base64.h"
@@ skipping 32 matching lines @@
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/file_browser_handler.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/disks/disk_mount_manager.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 "grit/generated_resources.h"
 #include "grit/platform_locale_settings.h"
 #include "net/base/escape.h"
 #include "ui/base/dialogs/selected_file_info.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/chromeos/fileapi/cros_mount_point_provider.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
@@ skipping 106 matching lines @@
                                 int permissions) {
   ChildProcessSecurityPolicy::GetInstance()->GrantPermissionsForFile(
       host->GetProcess()->GetID(), path, permissions);
 }
 
 void AddDriveMountPoint(
     Profile* profile,
     const std::string& extension_id,
     content::RenderViewHost* render_view_host) {
   fileapi::ExternalFileSystemMountPointProvider* provider =
-      BrowserContext::GetFileSystemContext(profile)->external_provider();
+      BrowserContext::GetDefaultStoragePartition(profile)->
+      GetFileSystemContext()->external_provider();
   if (!provider)
     return;
 
   const FilePath mount_point = gdata::util::GetDriveMountPointPath();
   if (!render_view_host || !render_view_host->GetProcess())
     return;
 
   // Grant R/W permissions to drive 'folder'. File API layer still
   // expects this to be satisfied.
   GrantFilePermissionsToHost(render_view_host,
@@ skipping 257 matching lines @@
           file_system_context,
           child_id,
           GetExtension()));
 }
 
 bool RequestLocalFileSystemFunction::RunImpl() {
   if (!dispatcher() || !render_view_host() || !render_view_host()->GetProcess())
     return false;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
-      BrowserContext::GetFileSystemContext(profile_);
+      BrowserContext::GetDefaultStoragePartition(profile_)->
+          GetFileSystemContext();
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &RequestLocalFileSystemFunction::RequestOnFileThread,
           this,
           file_system_context,
           source_url_,
           render_view_host()->GetProcess()->GetID()));
   // Will finish asynchronously.
   return true;
@@ skipping 41 matching lines @@
   if (!render_view_host() || !render_view_host()->GetProcess())
     return false;
 
   // First param is url of a file to watch.
   std::string url;
   if (!args_->GetString(0, &url) || url.empty())
     return false;
 
   GURL file_watch_url(url);
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
-      BrowserContext::GetFileSystemContext(profile_);
+      BrowserContext::GetStoragePartition(profile_,
+          render_view_host()->GetSiteInstance())->GetFileSystemContext();
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &FileWatchBrowserFunctionBase::RunFileWatchOperationOnFileThread,
           this,
           file_system_context,
           FileBrowserEventRouterFactory::GetForProfile(profile_),
           file_watch_url,
           extension_id()));
 
@@ skipping 435 matching lines @@
     LOG(WARNING) << "No associated tab contents";
     return 0;
   }
   return ExtensionTabUtil::GetTabId(web_contents);
 }
 
 void FileBrowserFunction::GetLocalPathsOnFileThreadAndRunCallbackOnUIThread(
     const UrlList& file_urls,
     GetLocalPathsCallback callback) {
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
-      BrowserContext::GetFileSystemContext(profile_);
+      BrowserContext::GetDefaultStoragePartition(profile())->
+          GetFileSystemContext();
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
           &FileBrowserFunction::GetLocalPathsOnFileThread,
           this,
           file_system_context, file_urls, callback));
 }
 
 // GetFileSystemRootPathOnFileThread can only be called from the file thread,
 // so here we are. This function takes a vector of virtual paths, converts
@@ skipping 1496 matching lines @@
 
 SearchDriveFunction::~SearchDriveFunction() {}
 
 bool SearchDriveFunction::RunImpl() {
   if (!args_->GetString(0, &query_))
     return false;
 
   if (!args_->GetString(1, &next_feed_))
     return false;
 
-  BrowserContext::GetFileSystemContext(profile())->OpenFileSystem(
-      source_url_.GetOrigin(), fileapi::kFileSystemTypeExternal, false,
-      base::Bind(&SearchDriveFunction::OnFileSystemOpened, this));
+  BrowserContext::GetStoragePartition(
+      profile(),
+      render_view_host()->GetSiteInstance())->

[michaeln, 2012/09/15 01:48:33]

In some places in this module, we're looking up the partition based on the site
instance and in others referring to the default partition w/o question. Will the
indirection thru the SiteInstance ever result in a partition (and FSContext)
that is not the default?

[awong, 2012/09/15 02:05:02]

Good catch. I'm not sure. I'm reverting them all to GetDefaultStoragePartition()
for now.

+          GetFileSystemContext()->OpenFileSystem(
+              source_url_.GetOrigin(), fileapi::kFileSystemTypeExternal, false,
+              base::Bind(&SearchDriveFunction::OnFileSystemOpened, this));
   return true;
 }
 
 void SearchDriveFunction::OnFileSystemOpened(
     base::PlatformFileError result,
     const std::string& file_system_name,
     const GURL& file_system_url) {
   if (result != base::PLATFORM_FILE_OK) {
     SendResponse(false);
     return;
@@ skipping 93 matching lines @@
   gdata::DriveSystemService* system_service =
       gdata::DriveSystemServiceFactory::GetForProfile(profile_);
   if (!system_service || !system_service->file_system())
     return false;
 
   FilePath directory_path = GetVirtualPathFromURL(GURL(file_url_as_string));
   system_service->file_system()->RequestDirectoryRefresh(directory_path);
 
   return true;
 }