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

chrome/browser/chromeos/extensions/file_browser_private_api.cc

Index: chrome/browser/chromeos/extensions/file_browser_private_api.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
index f5714bf1b713be741bd4a137857093853a7005d8..4cd8a642e03313505582beba91d22e539c5f55ad 100644
--- a/chrome/browser/chromeos/extensions/file_browser_private_api.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_private_api.cc
@@ -50,6 +50,7 @@
 #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"
@@ -176,7 +177,8 @@ void AddDriveMountPoint(
     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;
 
@@ -454,7 +456,8 @@ bool RequestLocalFileSystemFunction::RunImpl() {
     return false;
 
   scoped_refptr<fileapi::FileSystemContext> file_system_context =
-      BrowserContext::GetFileSystemContext(profile_);
+      BrowserContext::GetDefaultStoragePartition(profile_)->
+          GetFileSystemContext();
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(
@@ -516,7 +519,8 @@ bool FileWatchBrowserFunctionBase::RunImpl() {
 
   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(
@@ -972,7 +976,8 @@ 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(
@@ -2489,9 +2494,12 @@ bool SearchDriveFunction::RunImpl() {
   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;
 }