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

chrome/browser/ui/webui/options/cookies_view_handler.cc

Index: chrome/browser/ui/webui/options/cookies_view_handler.cc
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index 8bf447d091e184e1144a1c604b47001f1ae3e6de..c8c7b74b367b5d27f46f831b321cc23821f8e900 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -24,10 +24,17 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/cookies_tree_model_util.h"
+#include "content/public/browser/browser_context.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
+namespace fileapi {
+class FileSystemContext;
+}
+
 namespace options {
 
 CookiesViewHandler::CookiesViewHandler()
@@ -188,6 +195,9 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
   if (!app_context_ && !cookies_tree_model_.get()) {
     Profile* profile = Profile::FromWebUI(web_ui());
     ContainerMap apps_map;
+    fileapi::FileSystemContext* file_system_context =
+        content::BrowserContext::GetDefaultStoragePartition(profile)->
+            GetFileSystemContext();
     apps_map[std::string()] = new LocalDataContainer(
         "Site Data", std::string(),
         new BrowsingDataCookieHelper(profile->GetRequestContext()),
@@ -196,7 +206,7 @@ void CookiesViewHandler::EnsureCookiesTreeModelCreated() {
         NULL,
         new BrowsingDataAppCacheHelper(profile),
         BrowsingDataIndexedDBHelper::Create(profile),
-        BrowsingDataFileSystemHelper::Create(profile),
+        BrowsingDataFileSystemHelper::Create(file_system_context),
         BrowsingDataQuotaHelper::Create(profile),
         BrowsingDataServerBoundCertHelper::Create(profile),
         BrowsingDataFlashLSOHelper::Create(profile));