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

content/browser/renderer_host/pepper/pepper_file_io_host.cc

 // Copyright 2013 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 "content/browser/renderer_host/pepper/pepper_file_io_host.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/files/file_util_proxy.h"
@@ skipping 10 matching lines @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppb_file_io.h"
 #include "ppapi/host/dispatch_host_message.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #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 {
 
 using ppapi::FileIOStateManager;
 using ppapi::PPTimeToTime;
 
 namespace {
 
 PepperFileIOHost::UIThreadStuff GetUIThreadStuffForInternalFileSystems(
     int render_process_id) {
@@ skipping 34 matching lines @@
 
 void FileCloser(base::File auto_close) {
 }
 
 void DidCloseFile(const base::Closure& on_close_callback) {
   if (!on_close_callback.is_null())
     on_close_callback.Run();
 }
 
 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) {
     callback.Run(file.Pass(), on_close_callback);
   } else {
     BrowserThread::PostTaskAndReply(
         BrowserThread::FILE,
         FROM_HERE,
         base::Bind(&FileCloser, base::Passed(&file)),
         base::Bind(&DidCloseFile, on_close_callback));
@@ skipping 78 matching lines @@
   // it like internal file systems and access it via the FileSystemURL.
   bool is_internal_type = (file_system_type_ != PP_FILESYSTEMTYPE_EXTERNAL) ||
                           file_system_url_.is_valid();
 
   if (is_internal_type) {
     if (!file_system_url_.is_valid())
       return PP_ERROR_BADARGUMENT;
 
     // 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;
       }
     }
     if (!CanOpenFileSystemURLWithPepperFlags(
             open_flags, render_process_id_, file_system_url_))
       return PP_ERROR_NOACCESS;
     BrowserThread::PostTaskAndReplyWithResult(
         BrowserThread::UI,
@@ skipping 282 matching lines @@
 
   ppapi::proxy::SerializedHandle file_handle;
   // A non-zero resource id signals NaClIPCAdapter to create a NaClQuotaDesc.
   PP_Resource quota_file_io = check_quota_ ? pp_resource() : 0;
   file_handle.set_file_handle(transit_file, open_flags, quota_file_io);
   reply_context->params.AppendHandle(file_handle);
   return true;
 }
 
 }  // namespace content