summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/fileapi/browser_file_system_helper.cc10
-rw-r--r--content/browser/fileapi/fileapi_message_filter.cc2
-rw-r--r--content/browser/renderer_host/render_process_host_impl.cc2
-rw-r--r--content/browser/worker_host/worker_process_host.cc2
4 files changed, 8 insertions, 8 deletions
diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc
index 4944740..9d7f6ae 100644
--- a/content/browser/fileapi/browser_file_system_helper.cc
+++ b/content/browser/fileapi/browser_file_system_helper.cc
@@ -19,7 +19,7 @@
#include "content/public/common/url_constants.h"
#include "webkit/browser/fileapi/external_mount_points.h"
#include "webkit/browser/fileapi/file_permission_policy.h"
-#include "webkit/browser/fileapi/file_system_mount_point_provider.h"
+#include "webkit/browser/fileapi/file_system_backend.h"
#include "webkit/browser/fileapi/file_system_operation_runner.h"
#include "webkit/browser/fileapi/file_system_options.h"
#include "webkit/browser/fileapi/file_system_task_runners.h"
@@ -64,8 +64,8 @@ scoped_refptr<fileapi::FileSystemContext> CreateFileSystemContext(
file_task_runner.get()));
// Setting up additional mount point providers.
- ScopedVector<fileapi::FileSystemMountPointProvider> additional_providers;
- GetContentClient()->browser()->GetAdditionalFileSystemMountPointProviders(
+ ScopedVector<fileapi::FileSystemBackend> additional_providers;
+ GetContentClient()->browser()->GetAdditionalFileSystemBackends(
profile_path,
special_storage_policy,
external_mount_points,
@@ -105,8 +105,8 @@ bool CheckFileSystemPermissionsForProcess(
return false;
}
- fileapi::FileSystemMountPointProvider* mount_point_provider =
- context->GetMountPointProvider(url.type());
+ fileapi::FileSystemBackend* mount_point_provider =
+ context->GetFileSystemBackend(url.type());
if (!mount_point_provider) {
*error = base::PLATFORM_FILE_ERROR_INVALID_URL;
return false;
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index 2b0e4e7..d6bc272 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -40,7 +40,7 @@
#include "webkit/common/fileapi/file_system_util.h"
using fileapi::FileSystemFileUtil;
-using fileapi::FileSystemMountPointProvider;
+using fileapi::FileSystemBackend;
using fileapi::FileSystemOperation;
using fileapi::FileSystemURL;
using fileapi::FileUpdateObserver;
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index cd97acb..7bd9337 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -127,7 +127,7 @@
#include "ppapi/shared_impl/ppapi_switches.h"
#include "ui/base/ui_base_switches.h"
#include "ui/gl/gl_switches.h"
-#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
#include "webkit/glue/resource_type.h"
#include "webkit/plugins/plugin_switches.h"
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index 3d38520..0e39438 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -49,7 +49,7 @@
#include "net/url_request/url_request_context_getter.h"
#include "ui/base/ui_base_switches.h"
#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
#include "webkit/glue/resource_type.h"
#if defined(OS_WIN)