Move browser-specific FileAPI code from webkit/fileapi to webkit/browser/fileapi

This moves following files from webkit/fileapi to webkit/browser/fileapi:
- copy_or_move_file_validator*
- cross_operation_delegate*
- file_system_quota_client*
- recursive_operation_delegate*

BUG=239710
TBR=tzik@chromium.org

Review URL: https://codereview.chromium.org/15535006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201258 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 48 insertions, 48 deletions

diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
index 8dec24e..3dffe2b 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
@@ -12,9 +12,9 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "content/public/browser/browser_thread.h"
+#include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_types.h"
 
 using content::BrowserThread;
diff --git a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
index a737ff7..826742c 100644
--- a/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
+++ b/chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.cc
@@ -17,8 +17,8 @@
 #include "chrome/browser/media_galleries/fileapi/media_path_filter.h"
 #include "chrome/browser/media_galleries/fileapi/native_media_file_util.h"
 #include "webkit/blob/local_file_stream_reader.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/async_file_util_adapter.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_stream_reader.h"
 #include "webkit/fileapi/file_system_operation_context.h"
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 3c2386f..e055c9d 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -439,8 +439,10 @@
         '../webkit/blob/mock_blob_url_request_context.cc',
         '../webkit/blob/mock_blob_url_request_context.h',
         '../webkit/blob/shareable_file_reference_unittest.cc',
+        '../webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc',
         '../webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc',
         '../webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc',
+        '../webkit/browser/fileapi/file_system_quota_client_unittest.cc',
         '../webkit/browser/fileapi/file_system_url_request_job_unittest.cc',
         '../webkit/browser/fileapi/file_system_usage_cache_unittest.cc',
         '../webkit/browser/fileapi/obfuscated_file_util_unittest.cc',
@@ -464,11 +466,9 @@
         '../webkit/dom_storage/session_storage_database_unittest.cc',
         '../webkit/fileapi/async_file_test_helper.cc',
         '../webkit/fileapi/async_file_test_helper.h',
-        '../webkit/fileapi/copy_or_move_file_validator_unittest.cc',
         '../webkit/fileapi/external_mount_points_unittest.cc',
         '../webkit/fileapi/file_system_context_unittest.cc',
         '../webkit/fileapi/file_system_file_stream_reader_unittest.cc',
-        '../webkit/fileapi/file_system_quota_client_unittest.cc',
         '../webkit/fileapi/file_system_url_unittest.cc',
         '../webkit/fileapi/file_system_util_unittest.cc',
         '../webkit/fileapi/file_writer_delegate_unittest.cc',
diff --git a/webkit/fileapi/copy_or_move_file_validator.h b/webkit/browser/fileapi/copy_or_move_file_validator.h
index 1c15fa9..b60d332 100644
--- a/webkit/fileapi/copy_or_move_file_validator.h
+++ b/webkit/browser/fileapi/copy_or_move_file_validator.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_COPY_OR_MOVE_FILE_VALIDATOR_H_
-#define WEBKIT_FILEAPI_COPY_OR_MOVE_FILE_VALIDATOR_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_FILE_VALIDATOR_H_
+#define WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_FILE_VALIDATOR_H_
 
 #include "base/callback.h"
 #include "base/platform_file.h"
@@ -42,4 +42,4 @@ class CopyOrMoveFileValidatorFactory {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_COPY_OR_MOVE_FILE_VALIDATOR_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_COPY_OR_MOVE_FILE_VALIDATOR_H_
diff --git a/webkit/fileapi/copy_or_move_file_validator_unittest.cc b/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc
index b334136..ae232d7 100644
--- a/webkit/fileapi/copy_or_move_file_validator_unittest.cc
+++ b/webkit/browser/fileapi/copy_or_move_file_validator_unittest.cc
@@ -8,9 +8,9 @@
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/async_file_test_helper.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_url.h"
diff --git a/webkit/fileapi/cross_operation_delegate.cc b/webkit/browser/fileapi/cross_operation_delegate.cc
index a2633dd..1ee84ba 100644
--- a/webkit/fileapi/cross_operation_delegate.cc
+++ b/webkit/browser/fileapi/cross_operation_delegate.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/cross_operation_delegate.h"
+#include "webkit/browser/fileapi/cross_operation_delegate.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "webkit/blob/shareable_file_reference.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_url.h"
diff --git a/webkit/fileapi/cross_operation_delegate.h b/webkit/browser/fileapi/cross_operation_delegate.h
index 37f088c..d001a5e 100644
--- a/webkit/fileapi/cross_operation_delegate.h
+++ b/webkit/browser/fileapi/cross_operation_delegate.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_CROSS_OPERATION_DELEGATE_H_
-#define WEBKIT_FILEAPI_CROSS_OPERATION_DELEGATE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_CROSS_OPERATION_DELEGATE_H_
+#define WEBKIT_BROWSER_FILEAPI_CROSS_OPERATION_DELEGATE_H_
 
 #include <stack>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "webkit/fileapi/recursive_operation_delegate.h"
+#include "webkit/browser/fileapi/recursive_operation_delegate.h"
 
 namespace webkit_blob {
 class ShareableFileReference;
@@ -120,4 +120,4 @@ class CrossOperationDelegate
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_CROSS_OPERATION_DELEGATE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_CROSS_OPERATION_DELEGATE_H_
diff --git a/webkit/fileapi/file_system_quota_client.cc b/webkit/browser/fileapi/file_system_quota_client.cc
index 9be7d74..c0930f9 100644
--- a/webkit/fileapi/file_system_quota_client.cc
+++ b/webkit/browser/fileapi/file_system_quota_client.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/file_system_quota_client.h"
+#include "webkit/browser/fileapi/file_system_quota_client.h"
 
 #include <algorithm>
 #include <set>
@@ -18,10 +18,10 @@
 #include "base/task_runner_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
+#include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_util.h"
 
diff --git a/webkit/fileapi/file_system_quota_client.h b/webkit/browser/fileapi/file_system_quota_client.h
index 40f5221..cd1830d 100644
--- a/webkit/fileapi/file_system_quota_client.h
+++ b/webkit/browser/fileapi/file_system_quota_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
-#define WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
+#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
 
 #include <set>
 #include <string>
@@ -13,7 +13,7 @@
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
-#include "webkit/fileapi/file_system_quota_util.h"
+#include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/quota/quota_client.h"
 #include "webkit/storage/webkit_storage_export.h"
@@ -69,4 +69,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemQuotaClient
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_CLIENT_H_
diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/browser/fileapi/file_system_quota_client_unittest.cc
index 7139a43..9f40563 100644
--- a/webkit/fileapi/file_system_quota_client_unittest.cc
+++ b/webkit/browser/fileapi/file_system_quota_client_unittest.cc
@@ -11,12 +11,12 @@
 #include "base/platform_file.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/file_system_quota_client.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/obfuscated_file_util.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
-#include "webkit/fileapi/file_system_quota_client.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/mock_file_system_context.h"
diff --git a/webkit/fileapi/file_system_quota_util.h b/webkit/browser/fileapi/file_system_quota_util.h
index c2b92b7..4e0d0f6 100644
--- a/webkit/fileapi/file_system_quota_util.h
+++ b/webkit/browser/fileapi/file_system_quota_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_UTIL_H_
-#define WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_UTIL_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_UTIL_H_
+#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_UTIL_H_
 
 #include <set>
 #include <string>
@@ -54,4 +54,4 @@ class WEBKIT_STORAGE_EXPORT FileSystemQuotaUtil {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_QUOTA_UTIL_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_QUOTA_UTIL_H_
diff --git a/webkit/fileapi/recursive_operation_delegate.cc b/webkit/browser/fileapi/recursive_operation_delegate.cc
index 5ec0899..17fdb78 100644
--- a/webkit/fileapi/recursive_operation_delegate.cc
+++ b/webkit/browser/fileapi/recursive_operation_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/recursive_operation_delegate.h"
+#include "webkit/browser/fileapi/recursive_operation_delegate.h"
 
 #include "base/bind.h"
 #include "webkit/fileapi/file_system_context.h"
diff --git a/webkit/fileapi/recursive_operation_delegate.h b/webkit/browser/fileapi/recursive_operation_delegate.h
index 99d0bc0..23e0735 100644
--- a/webkit/fileapi/recursive_operation_delegate.h
+++ b/webkit/browser/fileapi/recursive_operation_delegate.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_
-#define WEBKIT_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_
+#define WEBKIT_BROWSER_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_
 
 #include <queue>
 
@@ -100,4 +100,4 @@ class RecursiveOperationDelegate
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_RECURSIVE_OPERATION_DELEGATE_H_
diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider.cc b/webkit/browser/fileapi/sandbox_mount_point_provider.cc
index 7fc2b4c..fe4adc3 100644
--- a/webkit/browser/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider.cc
@@ -14,12 +14,12 @@
 #include "base/task_runner_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/browser/fileapi/obfuscated_file_util.h"
 #include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
 #include "webkit/browser/fileapi/sandbox_quota_observer.h"
 #include "webkit/fileapi/async_file_util_adapter.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_stream_reader.h"
 #include "webkit/fileapi/file_system_operation_context.h"
diff --git a/webkit/browser/fileapi/sandbox_mount_point_provider.h b/webkit/browser/fileapi/sandbox_mount_point_provider.h
index 1b50964..38d5a1c 100644
--- a/webkit/browser/fileapi/sandbox_mount_point_provider.h
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider.h
@@ -16,8 +16,8 @@
 #include "base/memory/weak_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
+#include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_options.h"
-#include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/task_runner_bound_observer_list.h"
 #include "webkit/quota/special_storage_policy.h"
 #include "webkit/storage/webkit_storage_export.h"
diff --git a/webkit/browser/fileapi/webkit_browser_fileapi.gypi b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
index 45ad5a0..ef53257 100644
--- a/webkit/browser/fileapi/webkit_browser_fileapi.gypi
+++ b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
@@ -5,9 +5,15 @@
 {
   'variables': {
     'webkit_browser_fileapi_sources': [
+      '../browser/fileapi/copy_or_move_file_validator.h',
+      '../browser/fileapi/cross_operation_delegate.cc',
+      '../browser/fileapi/cross_operation_delegate.h',
       '../browser/fileapi/file_system_dir_url_request_job.cc',
       '../browser/fileapi/file_system_dir_url_request_job.h',
       '../browser/fileapi/file_system_mount_point_provider.h',
+      '../browser/fileapi/file_system_quota_client.cc',
+      '../browser/fileapi/file_system_quota_client.h',
+      '../browser/fileapi/file_system_quota_util.h',
       '../browser/fileapi/file_system_url_request_job.cc',
       '../browser/fileapi/file_system_url_request_job.h',
       '../browser/fileapi/file_system_url_request_job_factory.cc',
@@ -16,6 +22,8 @@
       '../browser/fileapi/file_system_usage_cache.h',
       '../browser/fileapi/obfuscated_file_util.cc',
       '../browser/fileapi/obfuscated_file_util.h',
+      '../browser/fileapi/recursive_operation_delegate.cc',
+      '../browser/fileapi/recursive_operation_delegate.h',
       '../browser/fileapi/sandbox_directory_database.cc',
       '../browser/fileapi/sandbox_directory_database.h',
       '../browser/fileapi/sandbox_file_stream_writer.cc',
diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
index 6c9be9d..e415943 100644
--- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc
+++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc
@@ -15,11 +15,11 @@
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebFileSystem.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/chromeos/fileapi/file_access_permissions.h"
 #include "webkit/chromeos/fileapi/remote_file_stream_writer.h"
 #include "webkit/chromeos/fileapi/remote_file_system_operation.h"
 #include "webkit/fileapi/async_file_util_adapter.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_stream_reader.h"
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc
index a0d2f45..2afe6f3 100644
--- a/webkit/fileapi/file_system_context.cc
+++ b/webkit/fileapi/file_system_context.cc
@@ -9,14 +9,14 @@
 #include "base/stl_util.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/blob/file_stream_reader.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
+#include "webkit/browser/fileapi/file_system_quota_client.h"
 #include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_stream_writer.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_options.h"
-#include "webkit/fileapi/file_system_quota_client.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc
index a5fe626..d9bab7a 100644
--- a/webkit/fileapi/file_writer_delegate_unittest.cc
+++ b/webkit/fileapi/file_writer_delegate_unittest.cc
@@ -17,11 +17,11 @@
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_status.h"
 #include "testing/platform_test.h"
+#include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
-#include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_writer_delegate.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/mock_file_system_context.h"
diff --git a/webkit/fileapi/isolated_mount_point_provider.cc b/webkit/fileapi/isolated_mount_point_provider.cc
index 7cba737..5a3aa89 100644
--- a/webkit/fileapi/isolated_mount_point_provider.cc
+++ b/webkit/fileapi/isolated_mount_point_provider.cc
@@ -14,8 +14,8 @@
 #include "base/platform_file.h"
 #include "base/sequenced_task_runner.h"
 #include "webkit/blob/local_file_stream_reader.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/async_file_util_adapter.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_stream_reader.h"
 #include "webkit/fileapi/file_system_operation_context.h"
diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc
index ba82ab0..9c9c3b8 100644
--- a/webkit/fileapi/local_file_system_operation.cc
+++ b/webkit/fileapi/local_file_system_operation.cc
@@ -11,10 +11,10 @@
 #include "net/base/escape.h"
 #include "net/url_request/url_request_context.h"
 #include "webkit/blob/shareable_file_reference.h"
+#include "webkit/browser/fileapi/cross_operation_delegate.h"
 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
 #include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
 #include "webkit/fileapi/async_file_util.h"
-#include "webkit/fileapi/cross_operation_delegate.h"
 #include "webkit/fileapi/file_observers.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
diff --git a/webkit/fileapi/local_file_system_operation_unittest.cc b/webkit/fileapi/local_file_system_operation_unittest.cc
index 9b46d73..d3934a9 100644
--- a/webkit/fileapi/local_file_system_operation_unittest.cc
+++ b/webkit/fileapi/local_file_system_operation_unittest.cc
@@ -16,11 +16,11 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/shareable_file_reference.h"
 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
+#include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/async_file_test_helper.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
-#include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_test_helper.h"
 #include "webkit/fileapi/mock_file_change_observer.h"
diff --git a/webkit/fileapi/remove_operation_delegate.h b/webkit/fileapi/remove_operation_delegate.h
index 20bdd23..4b76195 100644
--- a/webkit/fileapi/remove_operation_delegate.h
+++ b/webkit/fileapi/remove_operation_delegate.h
@@ -7,7 +7,7 @@
 
 #include <stack>
 
-#include "webkit/fileapi/recursive_operation_delegate.h"
+#include "webkit/browser/fileapi/recursive_operation_delegate.h"
 
 namespace fileapi {
 
diff --git a/webkit/fileapi/test_mount_point_provider.cc b/webkit/fileapi/test_mount_point_provider.cc
index b5c3a2d..56310d5 100644
--- a/webkit/fileapi/test_mount_point_provider.cc
+++ b/webkit/fileapi/test_mount_point_provider.cc
@@ -10,12 +10,12 @@
 
 #include "base/file_util.h"
 #include "base/sequenced_task_runner.h"
+#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
+#include "webkit/browser/fileapi/file_system_quota_util.h"
 #include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
-#include "webkit/fileapi/copy_or_move_file_validator.h"
 #include "webkit/fileapi/file_observers.h"
 #include "webkit/fileapi/file_system_file_stream_reader.h"
 #include "webkit/fileapi/file_system_operation_context.h"
-#include "webkit/fileapi/file_system_quota_util.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/local_file_util.h"
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi
index 5c23f1f..c30456a 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -8,9 +8,6 @@
       '../fileapi/async_file_util.h',
       '../fileapi/async_file_util_adapter.cc',
       '../fileapi/async_file_util_adapter.h',
-      '../fileapi/copy_or_move_file_validator.h',
-      '../fileapi/cross_operation_delegate.cc',
-      '../fileapi/cross_operation_delegate.h',
       '../fileapi/directory_entry.h',
       '../fileapi/external_mount_points.cc',
       '../fileapi/external_mount_points.h',
@@ -29,9 +26,6 @@
       '../fileapi/file_system_operation_context.h',
       '../fileapi/file_system_options.cc',
       '../fileapi/file_system_options.h',
-      '../fileapi/file_system_quota_client.cc',
-      '../fileapi/file_system_quota_client.h',
-      '../fileapi/file_system_quota_util.h',
       '../fileapi/file_system_task_runners.cc',
       '../fileapi/file_system_task_runners.h',
       '../fileapi/file_system_types.h',
@@ -57,8 +51,6 @@
       '../fileapi/mount_points.h',
       '../fileapi/native_file_util.cc',
       '../fileapi/native_file_util.h',
-      '../fileapi/recursive_operation_delegate.cc',
-      '../fileapi/recursive_operation_delegate.h',
       '../fileapi/remote_file_system_proxy.h',
       '../fileapi/remove_operation_delegate.cc',
       '../fileapi/remove_operation_delegate.h',