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

chrome/browser/extensions/api/file_handlers/app_file_handler_util.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 "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/extension_prefs.h"
 #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"
 #endif
 
 namespace extensions {
 
 namespace app_file_handler_util {
 
 const char kInvalidParameters[] = "Invalid parameters";
@@ skipping 255 matching lines @@
       FileHandlerCanHandleFileWithExtension(handler, path);
 }
 
 GrantedFileEntry CreateFileEntry(
     Profile* profile,
     const Extension* extension,
     int renderer_id,
     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 =
       content::ChildProcessSecurityPolicy::GetInstance();
   policy->GrantReadFileSystem(renderer_id, result.filesystem_id);
   if (HasFileSystemWritePermission(extension)) {
     if (is_directory) {
       policy->GrantCreateReadWriteFileSystem(renderer_id, result.filesystem_id);
     } else {
       policy->GrantWriteFileSystem(renderer_id, result.filesystem_id);
@@ skipping 26 matching lines @@
     const std::string& filesystem_path,
     const content::RenderViewHost* render_view_host,
     base::FilePath* file_path,
     std::string* error) {
   if (filesystem_path.empty()) {
     *error = kInvalidParameters;
     return false;
   }
 
   std::string filesystem_id;
-  if (!fileapi::CrackIsolatedFileSystemName(filesystem_name, &filesystem_id)) {
+  if (!storage::CrackIsolatedFileSystemName(filesystem_name, &filesystem_id)) {
     *error = kInvalidParameters;
     return false;
   }
 
   // Only return the display path if the process has read access to the
   // filesystem.
   content::ChildProcessSecurityPolicy* policy =
       content::ChildProcessSecurityPolicy::GetInstance();
   if (!policy->CanReadFileSystem(render_view_host->GetProcess()->GetID(),
                                  filesystem_id)) {
     *error = kSecurityError;
     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,
           &mount_option)) {
     *error = kInvalidParameters;
     return false;
   }
 
   // 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;
   }
 
   return true;
 }
 
 }  // namespace app_file_handler_util
 
 }  // namespace extensions