Index: chrome/browser/extensions/api/file_system/file_system_api.cc |
diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc |
index 6c8d5901c2fd5a04a26f04844361af80531e6505..212c88457fa0d3958bd6ef4d06e66a1226c7f3dc 100644 |
--- a/chrome/browser/extensions/api/file_system/file_system_api.cc |
+++ b/chrome/browser/extensions/api/file_system/file_system_api.cc |
@@ -42,10 +42,10 @@ |
#include "ui/base/l10n/l10n_util.h" |
#include "ui/shell_dialogs/select_file_dialog.h" |
#include "ui/shell_dialogs/selected_file_info.h" |
-#include "webkit/browser/fileapi/external_mount_points.h" |
-#include "webkit/browser/fileapi/isolated_context.h" |
-#include "webkit/common/fileapi/file_system_types.h" |
-#include "webkit/common/fileapi/file_system_util.h" |
+#include "storage/browser/fileapi/external_mount_points.h" |
+#include "storage/browser/fileapi/isolated_context.h" |
+#include "storage/common/fileapi/file_system_types.h" |
+#include "storage/common/fileapi/file_system_util.h" |
#if defined(OS_MACOSX) |
#include <CoreFoundation/CoreFoundation.h> |
@@ -59,7 +59,7 @@ |
using apps::SavedFileEntry; |
using apps::SavedFilesService; |
using apps::AppWindow; |
-using fileapi::IsolatedContext; |
+using storage::IsolatedContext; |
const char kInvalidCallingPage[] = "Invalid calling page. This function can't " |
"be called from a background page."; |
@@ -349,7 +349,7 @@ bool FileSystemIsWritableEntryFunction::RunSync() { |
EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &filesystem_path)); |
std::string filesystem_id; |
- if (!fileapi::CrackIsolatedFileSystemName(filesystem_name, &filesystem_id)) { |
+ if (!storage::CrackIsolatedFileSystemName(filesystem_name, &filesystem_id)) { |
error_ = app_file_handler_util::kInvalidParameters; |
return false; |
} |
@@ -570,10 +570,10 @@ void FileSystemChooseEntryFunction::RegisterTempExternalFileSystemForTest( |
// For testing on Chrome OS, where to deal with remote and local paths |
// smoothly, all accessed paths need to be registered in the list of |
// external mount points. |
- fileapi::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( |
+ storage::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem( |
name, |
- fileapi::kFileSystemTypeNativeLocal, |
- fileapi::FileSystemMountOption(), |
+ storage::kFileSystemTypeNativeLocal, |
+ storage::FileSystemMountOption(), |
path); |
} |