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

storage/browser/fileapi/local_file_util.cc

Index: storage/browser/fileapi/local_file_util.cc
diff --git a/webkit/browser/fileapi/local_file_util.cc b/storage/browser/fileapi/local_file_util.cc
similarity index 74%
rename from webkit/browser/fileapi/local_file_util.cc
rename to storage/browser/fileapi/local_file_util.cc
index 3b823aa99f6f2b5a283cccab2ca24bce8a874378..5e3e57fd562685a90af34e6076e74be4fa6a8d54 100644
--- a/webkit/browser/fileapi/local_file_util.cc
+++ b/storage/browser/fileapi/local_file_util.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/browser/fileapi/local_file_util.h"
+#include "storage/browser/fileapi/local_file_util.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util_proxy.h"
 #include "url/gurl.h"
-#include "webkit/browser/fileapi/async_file_util_adapter.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/fileapi/native_file_util.h"
-#include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/async_file_util_adapter.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/native_file_util.h"
+#include "storage/common/fileapi/file_system_types.h"
+#include "storage/common/fileapi/file_system_util.h"
 
-namespace fileapi {
+namespace storage {
 
 AsyncFileUtil* AsyncFileUtil::CreateForLocalFileSystem() {
   return new AsyncFileUtilAdapter(new LocalFileUtil());
@@ -29,8 +29,7 @@ class LocalFileEnumerator : public FileSystemFileUtil::AbstractFileEnumerator {
                       int file_type)
       : file_enum_(platform_root_path, false /* recursive */, file_type),
         platform_root_path_(platform_root_path),
-        virtual_root_path_(virtual_root_path) {
-  }
+        virtual_root_path_(virtual_root_path) {}
 
   virtual ~LocalFileEnumerator() {}
 
@@ -72,13 +71,15 @@ bool LocalFileEnumerator::IsDirectory() {
   return file_util_info_.IsDirectory();
 }
 
-LocalFileUtil::LocalFileUtil() {}
+LocalFileUtil::LocalFileUtil() {
+}
 
-LocalFileUtil::~LocalFileUtil() {}
+LocalFileUtil::~LocalFileUtil() {
+}
 
-base::File LocalFileUtil::CreateOrOpen(
-    FileSystemOperationContext* context,
-    const FileSystemURL& url, int file_flags) {
+base::File LocalFileUtil::CreateOrOpen(FileSystemOperationContext* context,
+                                       const FileSystemURL& url,
+                                       int file_flags) {
   base::FilePath file_path;
   base::File::Error error = GetLocalFilePath(context, url, &file_path);
   if (error != base::File::FILE_OK)
@@ -132,19 +133,19 @@ base::File::Error LocalFileUtil::GetFileInfo(
   return error;
 }
 
-scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator> LocalFileUtil::
-    CreateFileEnumerator(
-        FileSystemOperationContext* context,
-        const FileSystemURL& root_url) {
+scoped_ptr<FileSystemFileUtil::AbstractFileEnumerator>
+LocalFileUtil::CreateFileEnumerator(FileSystemOperationContext* context,
+                                    const FileSystemURL& root_url) {
   base::FilePath file_path;
-  if (GetLocalFilePath(context, root_url, &file_path) !=
-      base::File::FILE_OK) {
+  if (GetLocalFilePath(context, root_url, &file_path) != base::File::FILE_OK) {
     return make_scoped_ptr(new EmptyFileEnumerator)
         .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
   }
-  return make_scoped_ptr(new LocalFileEnumerator(
-      file_path, root_url.path(),
-      base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES))
+  return make_scoped_ptr(
+             new LocalFileEnumerator(file_path,
+                                     root_url.path(),
+                                     base::FileEnumerator::FILES |
+                                         base::FileEnumerator::DIRECTORIES))
       .PassAs<FileSystemFileUtil::AbstractFileEnumerator>();
 }
 
@@ -162,11 +163,10 @@ base::File::Error LocalFileUtil::GetLocalFilePath(
   return base::File::FILE_OK;
 }
 
-base::File::Error LocalFileUtil::Touch(
-    FileSystemOperationContext* context,
-    const FileSystemURL& url,
-    const base::Time& last_access_time,
-    const base::Time& last_modified_time) {
+base::File::Error LocalFileUtil::Touch(FileSystemOperationContext* context,
+                                       const FileSystemURL& url,
+                                       const base::Time& last_access_time,
+                                       const base::Time& last_modified_time) {
   base::FilePath file_path;
   base::File::Error error = GetLocalFilePath(context, url, &file_path);
   if (error != base::File::FILE_OK)
@@ -174,10 +174,9 @@ base::File::Error LocalFileUtil::Touch(
   return NativeFileUtil::Touch(file_path, last_access_time, last_modified_time);
 }
 
-base::File::Error LocalFileUtil::Truncate(
-    FileSystemOperationContext* context,
-    const FileSystemURL& url,
-    int64 length) {
+base::File::Error LocalFileUtil::Truncate(FileSystemOperationContext* context,
+                                          const FileSystemURL& url,
+                                          int64 length) {
   base::FilePath file_path;
   base::File::Error error = GetLocalFilePath(context, url, &file_path);
   if (error != base::File::FILE_OK)
@@ -202,8 +201,10 @@ base::File::Error LocalFileUtil::CopyOrMoveFile(
     return error;
 
   return NativeFileUtil::CopyOrMoveFile(
-      src_file_path, dest_file_path, option,
-      fileapi::NativeFileUtil::CopyOrMoveModeForDestination(dest_url, copy));
+      src_file_path,
+      dest_file_path,
+      option,
+      storage::NativeFileUtil::CopyOrMoveModeForDestination(dest_url, copy));
 }
 
 base::File::Error LocalFileUtil::CopyInForeignFile(
@@ -219,14 +220,15 @@ base::File::Error LocalFileUtil::CopyInForeignFile(
   if (error != base::File::FILE_OK)
     return error;
   return NativeFileUtil::CopyOrMoveFile(
-      src_file_path, dest_file_path, FileSystemOperation::OPTION_NONE,
-      fileapi::NativeFileUtil::CopyOrMoveModeForDestination(dest_url,
+      src_file_path,
+      dest_file_path,
+      FileSystemOperation::OPTION_NONE,
+      storage::NativeFileUtil::CopyOrMoveModeForDestination(dest_url,
                                                             true /* copy */));
 }
 
-base::File::Error LocalFileUtil::DeleteFile(
-    FileSystemOperationContext* context,
-    const FileSystemURL& url) {
+base::File::Error LocalFileUtil::DeleteFile(FileSystemOperationContext* context,
+                                            const FileSystemURL& url) {
   base::FilePath file_path;
   base::File::Error error = GetLocalFilePath(context, url, &file_path);
   if (error != base::File::FILE_OK)
@@ -244,7 +246,7 @@ base::File::Error LocalFileUtil::DeleteDirectory(
   return NativeFileUtil::DeleteDirectory(file_path);
 }
 
-webkit_blob::ScopedFile LocalFileUtil::CreateSnapshotFile(
+storage::ScopedFile LocalFileUtil::CreateSnapshotFile(
     FileSystemOperationContext* context,
     const FileSystemURL& url,
     base::File::Error* error,
@@ -255,7 +257,7 @@ webkit_blob::ScopedFile LocalFileUtil::CreateSnapshotFile(
   *error = GetFileInfo(context, url, file_info, platform_path);
   if (*error == base::File::FILE_OK && file_info->is_directory)
     *error = base::File::FILE_ERROR_NOT_A_FILE;
-  return webkit_blob::ScopedFile();
+  return storage::ScopedFile();
 }
 
-}  // namespace fileapi
+}  // namespace storage