Move misc browser-specific webkit/fileapi/* files to webkit/browser/fileapi

This moves following files into webkit/browser/fileapi:
- file_system_dir_url_request_job*
- file_system_url_request_job*
- file_system_usage_cache*

BUG=239710
TBR=tzik@chromium.org

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

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

27 files changed, 47 insertions, 47 deletions

diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
index 3708ccb..0a859c1 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper_unittest.cc
@@ -7,17 +7,17 @@
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
-#include "base/platform_file.h"
 #include "base/message_loop.h"
+#include "base/platform_file.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_thread.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 using content::BrowserContext;
diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc
index 94141d61..17161d8 100644
--- a/content/browser/storage_partition_impl_map.cc
+++ b/content/browser/storage_partition_impl_map.cc
@@ -35,7 +35,7 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_url_request_job_factory.h"
-#include "webkit/fileapi/file_system_url_request_job_factory.h"
+#include "webkit/browser/fileapi/file_system_url_request_job_factory.h"
 
 using appcache::AppCacheService;
 using fileapi::FileSystemContext;
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 78c30f1..0d0ed5b 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -432,7 +432,10 @@
         '../webkit/appcache/mock_appcache_storage.cc',
         '../webkit/appcache/mock_appcache_storage.h',
         '../webkit/appcache/mock_appcache_storage_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_url_request_job_unittest.cc',
+        '../webkit/browser/fileapi/file_system_usage_cache_unittest.cc',
         '../webkit/blob/blob_storage_context_unittest.cc',
         '../webkit/blob/blob_storage_controller_unittest.cc',
         '../webkit/blob/blob_url_request_job_unittest.cc',
@@ -458,12 +461,9 @@
         '../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_dir_url_request_job_unittest.cc',
         '../webkit/fileapi/file_system_file_stream_reader_unittest.cc',
         '../webkit/fileapi/file_system_quota_client_unittest.cc',
-        '../webkit/fileapi/file_system_url_request_job_unittest.cc',
         '../webkit/fileapi/file_system_url_unittest.cc',
-        '../webkit/fileapi/file_system_usage_cache_unittest.cc',
         '../webkit/fileapi/file_system_util_unittest.cc',
         '../webkit/fileapi/file_writer_delegate_unittest.cc',
         '../webkit/fileapi/isolated_context_unittest.cc',
diff --git a/webkit/fileapi/file_system_dir_url_request_job.cc b/webkit/browser/fileapi/file_system_dir_url_request_job.cc
index 472ba08..f94f99e 100644
--- a/webkit/fileapi/file_system_dir_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job.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_dir_url_request_job.h"
+#include "webkit/browser/fileapi/file_system_dir_url_request_job.h"
 
 #include <algorithm>
 
diff --git a/webkit/fileapi/file_system_dir_url_request_job.h b/webkit/browser/fileapi/file_system_dir_url_request_job.h
index 81c3ff0..f3cae42 100644
--- a/webkit/fileapi/file_system_dir_url_request_job.h
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job.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_DIR_URL_REQUEST_JOB_H_
-#define WEBKIT_FILEAPI_FILE_SYSTEM_DIR_URL_REQUEST_JOB_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_DIR_URL_REQUEST_JOB_H_
+#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_DIR_URL_REQUEST_JOB_H_
 
 #include <string>
 #include <vector>
@@ -65,4 +65,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemDirURLRequestJob
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_DIR_URL_REQUEST_JOB_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_DIR_URL_REQUEST_JOB_H_
diff --git a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc
index 0713282..61fe64a 100644
--- a/webkit/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.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_dir_url_request_job.h"
+#include "webkit/browser/fileapi/file_system_dir_url_request_job.h"
 
 #include <string>
 
diff --git a/webkit/fileapi/file_system_url_request_job.cc b/webkit/browser/fileapi/file_system_url_request_job.cc
index ef560da..02da91b 100644
--- a/webkit/fileapi/file_system_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job.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_url_request_job.h"
+#include "webkit/browser/fileapi/file_system_url_request_job.h"
 
 #include <vector>
 
diff --git a/webkit/fileapi/file_system_url_request_job.h b/webkit/browser/fileapi/file_system_url_request_job.h
index 55f6e70..49b4dc0 100644
--- a/webkit/fileapi/file_system_url_request_job.h
+++ b/webkit/browser/fileapi/file_system_url_request_job.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_URL_REQUEST_JOB_H_
-#define WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
+#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
 
 #include <string>
 
@@ -81,4 +81,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemURLRequestJob
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_H_
diff --git a/webkit/fileapi/file_system_url_request_job_factory.cc b/webkit/browser/fileapi/file_system_url_request_job_factory.cc
index f0bf0d8..76ae7c9 100644
--- a/webkit/fileapi/file_system_url_request_job_factory.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job_factory.cc
@@ -2,15 +2,15 @@
 // 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_url_request_job_factory.h"
+#include "webkit/browser/fileapi/file_system_url_request_job_factory.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "net/url_request/url_request.h"
-#include "webkit/fileapi/file_system_url_request_job.h"
-#include "webkit/fileapi/file_system_dir_url_request_job.h"
+#include "webkit/browser/fileapi/file_system_dir_url_request_job.h"
+#include "webkit/browser/fileapi/file_system_url_request_job.h"
 
 namespace fileapi {
 
diff --git a/webkit/fileapi/file_system_url_request_job_factory.h b/webkit/browser/fileapi/file_system_url_request_job_factory.h
index 673d852..fc7bcea 100644
--- a/webkit/fileapi/file_system_url_request_job_factory.h
+++ b/webkit/browser/fileapi/file_system_url_request_job_factory.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_URL_REQUEST_JOB_FACTORY_H_
-#define WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
+#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
 
 #include "net/url_request/url_request_job_factory.h"
 
@@ -25,4 +25,4 @@ WEBKIT_STORAGE_EXPORT net::URLRequestJobFactory::ProtocolHandler*
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_URL_REQUEST_JOB_FACTORY_H_
diff --git a/webkit/fileapi/file_system_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
index 21ab3f2..e66c927 100644
--- a/webkit/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job_unittest.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_url_request_job.h"
+#include "webkit/browser/fileapi/file_system_url_request_job.h"
 
 #include <string>
 
diff --git a/webkit/fileapi/file_system_usage_cache.cc b/webkit/browser/fileapi/file_system_usage_cache.cc
index 3f371d8..d6eb8f3 100644
--- a/webkit/fileapi/file_system_usage_cache.cc
+++ b/webkit/browser/fileapi/file_system_usage_cache.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_usage_cache.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 
 #include <utility>
 
diff --git a/webkit/fileapi/file_system_usage_cache.h b/webkit/browser/fileapi/file_system_usage_cache.h
index 3058f1b..f7b2149 100644
--- a/webkit/fileapi/file_system_usage_cache.h
+++ b/webkit/browser/fileapi/file_system_usage_cache.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_USAGE_CACHE_H_
-#define WEBKIT_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_
+#define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_
 
 #include <map>
 
@@ -100,4 +100,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemUsageCache {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_USAGE_CACHE_H_
diff --git a/webkit/fileapi/file_system_usage_cache_unittest.cc b/webkit/browser/fileapi/file_system_usage_cache_unittest.cc
index 324bc3c..33560cc 100644
--- a/webkit/fileapi/file_system_usage_cache_unittest.cc
+++ b/webkit/browser/fileapi/file_system_usage_cache_unittest.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_usage_cache.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
diff --git a/webkit/browser/fileapi/webkit_browser_fileapi.gypi b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
index 714257f..c4a3cda 100644
--- a/webkit/browser/fileapi/webkit_browser_fileapi.gypi
+++ b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
@@ -5,7 +5,15 @@
 {
   'variables': {
     'webkit_browser_fileapi_sources': [
+      '../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_url_request_job.cc',
+      '../browser/fileapi/file_system_url_request_job.h',
+      '../browser/fileapi/file_system_url_request_job_factory.cc',
+      '../browser/fileapi/file_system_url_request_job_factory.h',
+      '../browser/fileapi/file_system_usage_cache.cc',
+      '../browser/fileapi/file_system_usage_cache.h',
     ],
   },
 }
diff --git a/webkit/fileapi/file_system_quota_client.cc b/webkit/fileapi/file_system_quota_client.cc
index 8f38b17..efee4a5 100644
--- a/webkit/fileapi/file_system_quota_client.cc
+++ b/webkit/fileapi/file_system_quota_client.cc
@@ -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_usage_cache.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_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 
diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc
index cb28310..ab11779 100644
--- a/webkit/fileapi/file_system_quota_client_unittest.cc
+++ b/webkit/fileapi/file_system_quota_client_unittest.cc
@@ -11,11 +11,11 @@
 #include "base/platform_file.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.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_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/mock_file_system_context.h"
 #include "webkit/fileapi/obfuscated_file_util.h"
diff --git a/webkit/fileapi/local_file_system_quota_unittest.cc b/webkit/fileapi/local_file_system_quota_unittest.cc
index 383d818..6a5f3f5 100644
--- a/webkit/fileapi/local_file_system_quota_unittest.cc
+++ b/webkit/fileapi/local_file_system_quota_unittest.cc
@@ -17,10 +17,10 @@
 #include "base/platform_file.h"
 #include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/async_file_test_helper.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/local_file_system_test_helper.h"
diff --git a/webkit/fileapi/local_file_system_test_helper.cc b/webkit/fileapi/local_file_system_test_helper.cc
index 7cead72..eae6dea 100644
--- a/webkit/fileapi/local_file_system_test_helper.cc
+++ b/webkit/fileapi/local_file_system_test_helper.cc
@@ -8,12 +8,12 @@
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.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_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/mock_file_system_context.h"
diff --git a/webkit/fileapi/local_file_system_test_helper.h b/webkit/fileapi/local_file_system_test_helper.h
index c2339da..8e8af13 100644
--- a/webkit/fileapi/local_file_system_test_helper.h
+++ b/webkit/fileapi/local_file_system_test_helper.h
@@ -10,9 +10,9 @@
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/quota/quota_types.h"
 
diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/fileapi/obfuscated_file_util_unittest.cc
index e492bb5..ab6c6cf 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/fileapi/obfuscated_file_util_unittest.cc
@@ -15,12 +15,12 @@
 #include "base/platform_file.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/async_file_test_helper.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/local_file_system_test_helper.h"
 #include "webkit/fileapi/mock_file_change_observer.h"
 #include "webkit/fileapi/mock_file_system_context.h"
diff --git a/webkit/fileapi/sandbox_directory_database.cc b/webkit/fileapi/sandbox_directory_database.cc
index 008e3a11..794e7d3 100644
--- a/webkit/fileapi/sandbox_directory_database.cc
+++ b/webkit/fileapi/sandbox_directory_database.cc
@@ -17,7 +17,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 
 namespace {
diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/fileapi/sandbox_mount_point_provider.cc
index 3ad9832..13f0902 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider.cc
@@ -14,6 +14,7 @@
 #include "base/task_runner_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.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"
@@ -22,7 +23,6 @@
 #include "webkit/fileapi/file_system_options.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_types.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/obfuscated_file_util.h"
diff --git a/webkit/fileapi/sandbox_quota_observer.cc b/webkit/fileapi/sandbox_quota_observer.cc
index 0e49710..100d33f 100644
--- a/webkit/fileapi/sandbox_quota_observer.cc
+++ b/webkit/fileapi/sandbox_quota_observer.cc
@@ -5,8 +5,8 @@
 #include "webkit/fileapi/sandbox_quota_observer.h"
 
 #include "base/sequenced_task_runner.h"
+#include "webkit/browser/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/file_system_usage_cache.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/quota_client.h"
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi
index 8f1a637..1eb8001 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -20,8 +20,6 @@
       '../fileapi/file_stream_writer.h',
       '../fileapi/file_system_context.cc',
       '../fileapi/file_system_context.h',
-      '../fileapi/file_system_dir_url_request_job.cc',
-      '../fileapi/file_system_dir_url_request_job.h',
       '../fileapi/file_system_file_stream_reader.cc',
       '../fileapi/file_system_file_stream_reader.h',
       '../fileapi/file_system_file_util.cc',
@@ -39,12 +37,6 @@
       '../fileapi/file_system_types.h',
       '../fileapi/file_system_url.cc',
       '../fileapi/file_system_url.h',
-      '../fileapi/file_system_url_request_job.cc',
-      '../fileapi/file_system_url_request_job.h',
-      '../fileapi/file_system_url_request_job_factory.cc',
-      '../fileapi/file_system_url_request_job_factory.h',
-      '../fileapi/file_system_usage_cache.cc',
-      '../fileapi/file_system_usage_cache.h',
       '../fileapi/file_system_util.cc',
       '../fileapi/file_system_util.h',
       '../fileapi/file_writer_delegate.cc',
diff --git a/webkit/tools/test_shell/simple_resource_loader_bridge.cc b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
index 88a86ea..934f252 100644
--- a/webkit/tools/test_shell/simple_resource_loader_bridge.cc
+++ b/webkit/tools/test_shell/simple_resource_loader_bridge.cc
@@ -65,9 +65,9 @@
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job.h"
 #include "webkit/blob/shareable_file_reference.h"
+#include "webkit/browser/fileapi/file_system_dir_url_request_job.h"
+#include "webkit/browser/fileapi/file_system_url_request_job.h"
 #include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/file_system_dir_url_request_job.h"
-#include "webkit/fileapi/file_system_url_request_job.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/glue/resource_request_body.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc
index af3df4e..3e06ea5 100644
--- a/webkit/tools/test_shell/test_shell_request_context.cc
+++ b/webkit/tools/test_shell/test_shell_request_context.cc
@@ -31,8 +31,8 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/blob_url_request_job_factory.h"
+#include "webkit/browser/fileapi/file_system_url_request_job_factory.h"
 #include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/file_system_url_request_job_factory.h"
 #include "webkit/tools/test_shell/simple_file_system.h"
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/user_agent/user_agent.h"