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

chrome/browser/chromeos/extensions/file_browser_private_apitest.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 <stdio.h>
 
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/disks/mock_disk_mount_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 ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::ReturnRef;
 using ::testing::StrEq;
 using content::BrowserContext;
 
 using chromeos::disks::DiskMountManager;
@@ skipping 155 matching lines @@
   // ExtensionApiTest override
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     chromeos::disks::DiskMountManager::Shutdown();
     disk_mount_manager_mock_ = NULL;
 
     ExtensionApiTest::TearDownInProcessBrowserTestFixture();
   }
 
   void AddTmpMountPoint() {
     fileapi::ExternalFileSystemMountPointProvider* provider =
-        BrowserContext::GetFileSystemContext(browser()->profile())->
-            external_provider();
+        BrowserContext::GetDefaultStoragePartition(browser()->profile())->
+            GetFileSystemContext()->external_provider();
     provider->AddLocalMountPoint(test_mount_point_);
   }
 
  private:
   void InitMountPoints() {
     for (size_t i = 0; i < arraysize(kTestMountPoints); i++) {
       mount_points_.insert(DiskMountManager::MountPointMap::value_type(
           kTestMountPoints[i].mount_path,
           DiskMountManager::MountPointInfo(kTestMountPoints[i].source_path,
                                            kTestMountPoints[i].mount_path,
@@ skipping 61 matching lines @@
               UnmountPath(StrEq("/media/archive/archive_mount_path"))).Times(1);
 
   EXPECT_CALL(*disk_mount_manager_mock_, disks())
       .WillRepeatedly(ReturnRef(volumes_));
 
   EXPECT_CALL(*disk_mount_manager_mock_, mount_points())
       .WillRepeatedly(ReturnRef(mount_points_));
 
   ASSERT_TRUE(RunComponentExtensionTest("filebrowser_mount"))  << message_;
 }