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

chrome/browser/chromeos/gdata/drive_system_service.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/gdata/drive_system_service.h"
 
 #include "base/bind.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/gdata/drive_api_service.h"
 #include "chrome/browser/chromeos/gdata/drive_download_observer.h"
 #include "chrome/browser/chromeos/gdata/drive_file_system.h"
 #include "chrome/browser/chromeos/gdata/drive_file_system_proxy.h"
 #include "chrome/browser/chromeos/gdata/drive_file_system_util.h"
 #include "chrome/browser/chromeos/gdata/drive_sync_client.h"
 #include "chrome/browser/chromeos/gdata/drive_uploader.h"
 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/gdata/file_write_helper.h"
 #include "chrome/browser/chromeos/gdata/gdata_wapi_service.h"
 #include "chrome/browser/chromeos/gdata/stale_cache_files_remover.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/google_apis/gdata_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
 namespace gdata {
 namespace {
 
 // Used in test to setup system service.
@@ skipping 96 matching lines @@
   if (!callback.is_null())
     callback.Run(error == DRIVE_FILE_OK);
 }
 
 void DriveSystemService::AddDriveMountPoint() {
   if (!gdata::util::IsGDataAvailable(profile_))
     return;
 
   const FilePath mount_point = gdata::util::GetDriveMountPointPath();
   fileapi::ExternalFileSystemMountPointProvider* provider =
-      BrowserContext::GetFileSystemContext(profile_)->external_provider();
+      BrowserContext::GetDefaultStoragePartition(profile_)->
+          GetFileSystemContext()->external_provider();
   if (provider && !provider->HasMountPoint(mount_point)) {
     provider->AddRemoteMountPoint(
         mount_point,
         new DriveFileSystemProxy(file_system_.get()));
   }
 
   file_system_->NotifyFileSystemMounted();
 }
 
 void DriveSystemService::RemoveDriveMountPoint() {
   file_system_->NotifyFileSystemToBeUnmounted();
   file_system_->StopUpdates();
 
   const FilePath mount_point = gdata::util::GetDriveMountPointPath();
   fileapi::ExternalFileSystemMountPointProvider* provider =
-      BrowserContext::GetFileSystemContext(profile_)->external_provider();
+      BrowserContext::GetDefaultStoragePartition(profile_)->
+          GetFileSystemContext()->external_provider();
   if (provider && provider->HasMountPoint(mount_point))
     provider->RemoveMountPoint(mount_point);
 }
 
 //===================== DriveSystemServiceFactory =============================
 
 // static
 DriveSystemService* DriveSystemServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<DriveSystemService*>(
@@ skipping 54 matching lines @@
       g_test_cache_root ? FilePath(*g_test_cache_root) :
                           DriveCache::GetCacheRootPath(profile);
   delete g_test_cache_root;
   g_test_cache_root = NULL;
 
   service->Initialize(drive_service, cache_root);
   return service;
 }
 
 }  // namespace gdata