Move storage-related files from webkit/ to new top-level directory storage/

chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc

Index: chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
diff --git a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
index dd6b81d542a1b38e803f04c3c7fe0ae1ed78f9e9..cd01cac4e73d8af27ef247e2d8f243861b367d0e 100644
--- a/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
+++ b/chrome/browser/extensions/api/file_handlers/app_file_handler_util.cc
@@ -14,9 +14,9 @@
 #include "extensions/browser/granted_file_entry.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "net/base/mime_util.h"
-#include "webkit/browser/fileapi/isolated_context.h"
-#include "webkit/common/fileapi/file_system_mount_option.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/browser/fileapi/isolated_context.h"
+#include "storage/common/fileapi/file_system_mount_option.h"
+#include "storage/common/fileapi/file_system_types.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h"
@@ -292,12 +292,14 @@ GrantedFileEntry CreateFileEntry(
     const base::FilePath& path,
     bool is_directory) {
   GrantedFileEntry result;
-  fileapi::IsolatedContext* isolated_context =
-      fileapi::IsolatedContext::GetInstance();
+  storage::IsolatedContext* isolated_context =
+      storage::IsolatedContext::GetInstance();
   DCHECK(isolated_context);
 
   result.filesystem_id = isolated_context->RegisterFileSystemForPath(
-      fileapi::kFileSystemTypeNativeForPlatformApp, std::string(), path,
+      storage::kFileSystemTypeNativeForPlatformApp,
+      std::string(),
+      path,
       &result.registered_name);
 
   content::ChildProcessSecurityPolicy* policy =
@@ -344,7 +346,7 @@ bool ValidateFileEntryAndGetPath(
   }
 
   std::string filesystem_id;
-  if (!fileapi::CrackIsolatedFileSystemName(filesystem_name, &filesystem_id)) {
+  if (!storage::CrackIsolatedFileSystemName(filesystem_name, &filesystem_id)) {
     *error = kInvalidParameters;
     return false;
   }
@@ -359,13 +361,13 @@ bool ValidateFileEntryAndGetPath(
     return false;
   }
 
-  fileapi::IsolatedContext* context = fileapi::IsolatedContext::GetInstance();
+  storage::IsolatedContext* context = storage::IsolatedContext::GetInstance();
   base::FilePath relative_path =
       base::FilePath::FromUTF8Unsafe(filesystem_path);
   base::FilePath virtual_path = context->CreateVirtualRootPath(filesystem_id)
       .Append(relative_path);
-  fileapi::FileSystemType type;
-  fileapi::FileSystemMountOption mount_option;
+  storage::FileSystemType type;
+  storage::FileSystemMountOption mount_option;
   std::string cracked_id;
   if (!context->CrackVirtualPath(
           virtual_path, &filesystem_id, &type, &cracked_id, file_path,
@@ -377,8 +379,8 @@ bool ValidateFileEntryAndGetPath(
   // The file system API is only intended to operate on file entries that
   // correspond to a native file, selected by the user so only allow file
   // systems returned by the file system API or from a drag and drop operation.
-  if (type != fileapi::kFileSystemTypeNativeForPlatformApp &&
-      type != fileapi::kFileSystemTypeDragged) {
+  if (type != storage::kFileSystemTypeNativeForPlatformApp &&
+      type != storage::kFileSystemTypeDragged) {
     *error = kInvalidParameters;
     return false;
   }