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

chrome/browser/chromeos/drive/fileapi/fileapi_worker.h

 // Copyright 2014 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.
 //
 // This file provides the core implementation of fileapi methods.
 // The functions should be called on UI thread.
 // Note that most method invocation of fileapi is done on IO thread. The gap is
 // filled by FileSystemProxy.
 // Also, the order of arguments for the functions which take FileSystemInterface
 // at the last is intentional. The instance of FileSystemInterface should be
 // accessible only on UI thread, but arguments are passed on IO thread.
 // So, here is an intended use case:
 //   1) Bind arguments on IO thread. Then a callback instance whose type is
 //      Callback<void(FileSysstemInterface*)> is created.
 //   2) Post the task to the UI thread.
 //   3) On UI thread, check if the instance of FileSystemInterface is alive or
 //      not. If yes, Run the callback with it.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILEAPI_WORKER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILEAPI_WORKER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/drive/file_errors.h"
-#include "webkit/common/blob/scoped_file.h"
+#include "storage/common/blob/scoped_file.h"
 
 namespace base {
 class FilePath;
 }  // namespace base
 
-namespace fileapi {
+namespace storage {
 struct DirectoryEntry;
 class FileSystemURL;
-}  // namespace fileapi
+}  // namespace storage
 
 namespace drive {
 
 class FileSystemInterface;
 
-namespace fileapi_internal {
+namespace storage_internal {
 
 typedef base::Callback<FileSystemInterface*()> FileSystemGetter;
 
 typedef base::Callback<
     void(base::File::Error result)> StatusCallback;
 typedef base::Callback<
     void(base::File::Error result,
          const base::File::Info& file_info)> GetFileInfoCallback;
 typedef base::Callback<
     void(base::File::Error result,
-         const std::vector<fileapi::DirectoryEntry>& file_list,
+         const std::vector<storage::DirectoryEntry>& file_list,
          bool has_more)> ReadDirectoryCallback;
-typedef base::Callback<
-    void(base::File::Error result,
-         const base::File::Info& file_info,
-         const base::FilePath& snapshot_file_path,
-         webkit_blob::ScopedFile::ScopeOutPolicy scope_out_policy)>
-    CreateSnapshotFileCallback;
+typedef base::Callback<void(base::File::Error result,
+                            const base::File::Info& file_info,
+                            const base::FilePath& snapshot_file_path,
+                            storage::ScopedFile::ScopeOutPolicy
+                                scope_out_policy)> CreateSnapshotFileCallback;
 typedef base::Callback<
     void(base::File::Error result,
          const base::FilePath& snapshot_file_path,
          const base::Closure& close_callback)>
     CreateWritableSnapshotFileCallback;
 typedef base::Callback<
     void(base::File file,
          const base::Closure& close_callback)> OpenFileCallback;
 
 // Gets the profile of the Drive entry pointed by |url|. Used as
 // FileSystemGetter callback by binding an URL on the IO thread and passing to
 // the UI thread.
-FileSystemInterface* GetFileSystemFromUrl(const fileapi::FileSystemURL& url);
+FileSystemInterface* GetFileSystemFromUrl(const storage::FileSystemURL& url);
 
 // Runs |file_system_getter| to obtain the instance of FileSystemInstance,
 // and then runs |callback| with it.
 // If |file_system_getter| returns NULL, runs |error_callback| instead.
 // This function must be called on UI thread.
 // |file_system_getter| and |callback| must not be null, but
 // |error_callback| can be null (if no operation is necessary for error
 // case).
 void RunFileSystemCallback(
     const FileSystemGetter& file_system_getter,
@@ skipping 84 matching lines @@
               FileSystemInterface* file_system);
 
 // Changes timestamp of the file at |file_path| to |last_access_time| and
 // |last_modified_time|. Called from FileSystemProxy::TouchFile().
 void TouchFile(const base::FilePath& file_path,
                const base::Time& last_access_time,
                const base::Time& last_modified_time,
                const StatusCallback& callback,
                FileSystemInterface* file_system);
 
-}  // namespace fileapi_internal
+}  // namespace storage_internal
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_FILEAPI_FILEAPI_WORKER_H_