Index: content/browser/renderer_host/pepper/pepper_file_io_host.cc |
diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.cc b/content/browser/renderer_host/pepper/pepper_file_io_host.cc |
index e350138f8a76d480171a1c400b9fee4d54517e4c..94a50bfc5cb78ee39afbae67178786a03fee9d58 100644 |
--- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc |
+++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc |
@@ -28,11 +28,11 @@ |
#include "ppapi/shared_impl/file_system_util.h" |
#include "ppapi/shared_impl/file_type_conversion.h" |
#include "ppapi/shared_impl/time_conversion.h" |
-#include "webkit/browser/fileapi/file_observers.h" |
-#include "webkit/browser/fileapi/file_system_context.h" |
-#include "webkit/browser/fileapi/file_system_operation_runner.h" |
-#include "webkit/browser/fileapi/task_runner_bound_observer_list.h" |
-#include "webkit/common/fileapi/file_system_util.h" |
+#include "storage/browser/fileapi/file_observers.h" |
+#include "storage/browser/fileapi/file_system_context.h" |
+#include "storage/browser/fileapi/file_system_operation_runner.h" |
+#include "storage/browser/fileapi/task_runner_bound_observer_list.h" |
+#include "storage/common/fileapi/file_system_util.h" |
namespace content { |
@@ -87,7 +87,7 @@ void DidCloseFile(const base::Closure& on_close_callback) { |
} |
void DidOpenFile(base::WeakPtr<PepperFileIOHost> file_host, |
- fileapi::FileSystemOperation::OpenFileCallback callback, |
+ storage::FileSystemOperation::OpenFileCallback callback, |
base::File file, |
const base::Closure& on_close_callback) { |
if (file_host) { |
@@ -186,13 +186,13 @@ int32_t PepperFileIOHost::OnHostMsgOpen( |
// Not all external file systems are fully supported yet. |
// Whitelist the supported ones. |
- if (file_system_url_.mount_type() == fileapi::kFileSystemTypeExternal) { |
+ if (file_system_url_.mount_type() == storage::kFileSystemTypeExternal) { |
switch (file_system_url_.type()) { |
- case fileapi::kFileSystemTypeNativeMedia: |
- case fileapi::kFileSystemTypeDeviceMedia: |
- case fileapi::kFileSystemTypePicasa: |
- case fileapi::kFileSystemTypeItunes: |
- case fileapi::kFileSystemTypeIphoto: |
+ case storage::kFileSystemTypeNativeMedia: |
+ case storage::kFileSystemTypeDeviceMedia: |
+ case storage::kFileSystemTypePicasa: |
+ case storage::kFileSystemTypeItunes: |
+ case storage::kFileSystemTypeIphoto: |
break; |
default: |
return PP_ERROR_NOACCESS; |