Move FileAPI sandboxed filesystem related code from webkit/fileapi to webkit/browser/fileapi

This moves following files from webkit/fileapi to webkit/browser/fileapi:
- obfuscated_file_util*
- sandbox_database_test_helper*
- sandbox_directory_database*
- sandbox_file_stream_writer*
- sandbox_mount_point_provider*
- sandbox_origin_database*
- sandbox_quota_observer*

BUG=239710
TBR=avi@chromium.org, calvinlo@chromium.org, thestig@chromium.org, tzik@chromium.org

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

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

43 files changed, 89 insertions, 89 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 0b08935..8dec24e 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
@@ -12,10 +12,10 @@
 #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/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"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 using content::BrowserThread;
 
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 0a859c1..11d5eab 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
@@ -15,10 +15,10 @@
 #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/browser/fileapi/sandbox_mount_point_provider.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/sandbox_mount_point_provider.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 5948296..51098e3 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -43,8 +43,8 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/storage_partition.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #endif
 
 #if defined(ENABLE_APP_LIST)
diff --git a/content/browser/fileapi/browser_file_system_helper.cc b/content/browser/fileapi/browser_file_system_helper.cc
index 75a8aae7..2fd6d86 100644
--- a/content/browser/fileapi/browser_file_system_helper.cc
+++ b/content/browser/fileapi/browser_file_system_helper.cc
@@ -16,12 +16,12 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_permission_policy.h"
 #include "webkit/fileapi/file_system_options.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/local_file_system_operation.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace content {
diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc
index 2ffa88a..61b552b 100644
--- a/content/browser/fileapi/fileapi_message_filter.cc
+++ b/content/browser/fileapi/fileapi_message_filter.cc
@@ -27,6 +27,7 @@
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_storage_controller.h"
 #include "webkit/blob/shareable_file_reference.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/directory_entry.h"
 #include "webkit/fileapi/file_observers.h"
 #include "webkit/fileapi/file_permission_policy.h"
@@ -35,7 +36,6 @@
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/fileapi/local_file_system_operation.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/quota_manager.h"
 
 using fileapi::FileSystemFileUtil;
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index dbe2b35..1399cfa 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -123,7 +123,7 @@
 #include "ppapi/shared_impl/ppapi_switches.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/gl/gl_switches.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/plugins/plugin_switches.h"
 
diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc
index b818b9d..5b28343 100644
--- a/content/browser/worker_host/worker_process_host.cc
+++ b/content/browser/worker_host/worker_process_host.cc
@@ -48,8 +48,8 @@
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/ui_base_switches.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/glue/resource_type.h"
 
 #if defined(OS_WIN)
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 83902ca..3c2386f 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -432,10 +432,6 @@
         '../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',
@@ -443,6 +439,16 @@
         '../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/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/browser/fileapi/obfuscated_file_util_unittest.cc',
+        '../webkit/browser/fileapi/sandbox_database_test_helper.cc',
+        '../webkit/browser/fileapi/sandbox_database_test_helper.h',
+        '../webkit/browser/fileapi/sandbox_directory_database_unittest.cc',
+        '../webkit/browser/fileapi/sandbox_mount_point_provider_unittest.cc',
+        '../webkit/browser/fileapi/sandbox_origin_database_unittest.cc',
         '../webkit/chromeos/fileapi/cros_mount_point_provider_unittest.cc',
         '../webkit/chromeos/fileapi/file_access_permissions_unittest.cc',
         '../webkit/database/database_connections_unittest.cc',
@@ -479,12 +485,6 @@
         '../webkit/fileapi/mock_file_change_observer.cc',
         '../webkit/fileapi/mock_file_change_observer.h',
         '../webkit/fileapi/native_file_util_unittest.cc',
-        '../webkit/fileapi/obfuscated_file_util_unittest.cc',
-        '../webkit/fileapi/sandbox_database_test_helper.cc',
-        '../webkit/fileapi/sandbox_database_test_helper.h',
-        '../webkit/fileapi/sandbox_directory_database_unittest.cc',
-        '../webkit/fileapi/sandbox_mount_point_provider_unittest.cc',
-        '../webkit/fileapi/sandbox_origin_database_unittest.cc',
         '../webkit/fileapi/syncable/canned_syncable_file_system.cc',
         '../webkit/fileapi/syncable/canned_syncable_file_system.h',
         '../webkit/fileapi/syncable/file_change_unittest.cc',
diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc
index 61fe64a..c1f5a55 100644
--- a/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job_unittest.cc
@@ -22,12 +22,12 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/icu/public/i18n/unicode/regex.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.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_url.h"
 #include "webkit/fileapi/mock_file_system_context.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
diff --git a/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc b/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc
index 3995545..c7a9fd7 100644
--- a/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc
+++ b/webkit/browser/fileapi/file_system_mount_point_provider_unittest.cc
@@ -18,13 +18,13 @@
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/mock_file_system_options.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 #if defined(OS_CHROMEOS)
diff --git a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
index e66c927..27e6716 100644
--- a/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job_unittest.cc
@@ -28,11 +28,11 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.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/mock_file_system_context.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 namespace fileapi {
 namespace {
diff --git a/webkit/fileapi/obfuscated_file_util.cc b/webkit/browser/fileapi/obfuscated_file_util.cc
index 581c2a1..14b51d2 100644
--- a/webkit/fileapi/obfuscated_file_util.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util.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/obfuscated_file_util.h"
+#include "webkit/browser/fileapi/obfuscated_file_util.h"
 
 #include <queue>
 #include <string>
@@ -19,13 +19,13 @@
 #include "base/utf_string_conversions.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/base/origin_url_conversions.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/file_observers.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/native_file_util.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 #include "webkit/quota/quota_manager.h"
 
diff --git a/webkit/fileapi/obfuscated_file_util.h b/webkit/browser/fileapi/obfuscated_file_util.h
index ce05f33..b35976a 100644
--- a/webkit/fileapi/obfuscated_file_util.h
+++ b/webkit/browser/fileapi/obfuscated_file_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_OBFUSCATED_FILE_UTIL_H_
-#define WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_OBFUSCATED_FILE_UTIL_H_
+#define WEBKIT_BROWSER_FILEAPI_OBFUSCATED_FILE_UTIL_H_
 
 #include <map>
 #include <string>
@@ -14,11 +14,11 @@
 #include "base/platform_file.h"
 #include "base/timer.h"
 #include "webkit/blob/shareable_file_reference.h"
+#include "webkit/browser/fileapi/sandbox_directory_database.h"
+#include "webkit/browser/fileapi/sandbox_origin_database.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/sandbox_directory_database.h"
-#include "webkit/fileapi/sandbox_origin_database.h"
 #include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
@@ -259,4 +259,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE ObfuscatedFileUtil
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_OBFUSCATED_FILE_UTIL_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_OBFUSCATED_FILE_UTIL_H_
diff --git a/webkit/fileapi/obfuscated_file_util_unittest.cc b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
index ab6c6cf..655f8f7 100644
--- a/webkit/fileapi/obfuscated_file_util_unittest.cc
+++ b/webkit/browser/fileapi/obfuscated_file_util_unittest.cc
@@ -16,6 +16,7 @@
 #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/browser/fileapi/obfuscated_file_util.h"
 #include "webkit/fileapi/async_file_test_helper.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_context.h"
@@ -24,7 +25,6 @@
 #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"
-#include "webkit/fileapi/obfuscated_file_util.h"
 #include "webkit/fileapi/test_file_set.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 #include "webkit/quota/quota_manager.h"
diff --git a/webkit/fileapi/sandbox_database_test_helper.cc b/webkit/browser/fileapi/sandbox_database_test_helper.cc
index 2bf1c7c..19c3aae 100644
--- a/webkit/fileapi/sandbox_database_test_helper.cc
+++ b/webkit/browser/fileapi/sandbox_database_test_helper.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/sandbox_database_test_helper.h"
+#include "webkit/browser/fileapi/sandbox_database_test_helper.h"
 
 #include <algorithm>
 #include <functional>
diff --git a/webkit/fileapi/sandbox_database_test_helper.h b/webkit/browser/fileapi/sandbox_database_test_helper.h
index 3fc40a7..1635c2f 100644
--- a/webkit/fileapi/sandbox_database_test_helper.h
+++ b/webkit/browser/fileapi/sandbox_database_test_helper.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_SANDBOX_DATABASE_TEST_HELPER_H_
-#define WEBKIT_FILEAPI_SANDBOX_DATABASE_TEST_HELPER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_DATABASE_TEST_HELPER_H_
+#define WEBKIT_BROWSER_FILEAPI_SANDBOX_DATABASE_TEST_HELPER_H_
 
 #include <cstddef>
 
@@ -25,4 +25,4 @@ void DeleteDatabaseFile(const base::FilePath& db_path,
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SANDBOX_DATABASE_TEST_HELPER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_DATABASE_TEST_HELPER_H_
diff --git a/webkit/fileapi/sandbox_directory_database.cc b/webkit/browser/fileapi/sandbox_directory_database.cc
index 794e7d3..ba3988e 100644
--- a/webkit/fileapi/sandbox_directory_database.cc
+++ b/webkit/browser/fileapi/sandbox_directory_database.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/sandbox_directory_database.h"
+#include "webkit/browser/fileapi/sandbox_directory_database.h"
 
 #include <math.h>
 #include <algorithm>
diff --git a/webkit/fileapi/sandbox_directory_database.h b/webkit/browser/fileapi/sandbox_directory_database.h
index 9e4389e..c16c90d 100644
--- a/webkit/fileapi/sandbox_directory_database.h
+++ b/webkit/browser/fileapi/sandbox_directory_database.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_SANDBOX_DIRECTORY_DATABASE_H_
-#define WEBKIT_FILEAPI_SANDBOX_DIRECTORY_DATABASE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_DIRECTORY_DATABASE_H_
+#define WEBKIT_BROWSER_FILEAPI_SANDBOX_DIRECTORY_DATABASE_H_
 
 #include <string>
 #include <vector>
@@ -121,4 +121,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxDirectoryDatabase {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SANDBOX_DIRECTORY_DATABASE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_DIRECTORY_DATABASE_H_
diff --git a/webkit/fileapi/sandbox_directory_database_unittest.cc b/webkit/browser/fileapi/sandbox_directory_database_unittest.cc
index cf604d5..d6e8ada 100644
--- a/webkit/fileapi/sandbox_directory_database_unittest.cc
+++ b/webkit/browser/fileapi/sandbox_directory_database_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/sandbox_directory_database.h"
+#include "webkit/browser/fileapi/sandbox_directory_database.h"
 
 #include <math.h>
 #include <limits>
@@ -15,8 +15,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
+#include "webkit/browser/fileapi/sandbox_database_test_helper.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/sandbox_database_test_helper.h"
 
 #define FPL(x) FILE_PATH_LITERAL(x)
 
diff --git a/webkit/fileapi/sandbox_file_stream_writer.cc b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
index 1559414..fea9f16 100644
--- a/webkit/fileapi/sandbox_file_stream_writer.cc
+++ b/webkit/browser/fileapi/sandbox_file_stream_writer.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/sandbox_file_stream_writer.h"
+#include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
 
 #include "base/files/file_util_proxy.h"
 #include "base/platform_file.h"
diff --git a/webkit/fileapi/sandbox_file_stream_writer.h b/webkit/browser/fileapi/sandbox_file_stream_writer.h
index 28efcea..62c8316 100644
--- a/webkit/fileapi/sandbox_file_stream_writer.h
+++ b/webkit/browser/fileapi/sandbox_file_stream_writer.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_SANDBOX_FILE_STREAM_WRITER_H_
-#define WEBKIT_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_
+#define WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_
 
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ -89,4 +89,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxFileStreamWriter
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_FILE_STREAM_WRITER_H_
diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/browser/fileapi/sandbox_mount_point_provider.cc
index 13f0902..7fc2b4c 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider.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/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ -15,6 +15,9 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.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"
@@ -25,9 +28,6 @@
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_operation.h"
-#include "webkit/fileapi/obfuscated_file_util.h"
-#include "webkit/fileapi/sandbox_file_stream_writer.h"
-#include "webkit/fileapi/sandbox_quota_observer.h"
 #include "webkit/fileapi/syncable/syncable_file_system_operation.h"
 #include "webkit/quota/quota_manager.h"
 
diff --git a/webkit/fileapi/sandbox_mount_point_provider.h b/webkit/browser/fileapi/sandbox_mount_point_provider.h
index 91d1938..1b50964 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.h
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider.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_SANDBOX_MOUNT_POINT_PROVIDER_H_
-#define WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
+#define WEBKIT_BROWSER_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
 
 #include <set>
 #include <string>
@@ -262,4 +262,4 @@ class WEBKIT_STORAGE_EXPORT SandboxMountPointProvider
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_MOUNT_POINT_PROVIDER_H_
diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/browser/fileapi/sandbox_mount_point_provider_unittest.cc
index cca5cda..17c79f2 100644
--- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
+++ b/webkit/browser/fileapi/sandbox_mount_point_provider_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/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 
 #include <set>
 
diff --git a/webkit/fileapi/sandbox_origin_database.cc b/webkit/browser/fileapi/sandbox_origin_database.cc
index 54bcdef..5d80e58 100644
--- a/webkit/fileapi/sandbox_origin_database.cc
+++ b/webkit/browser/fileapi/sandbox_origin_database.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/sandbox_origin_database.h"
+#include "webkit/browser/fileapi/sandbox_origin_database.h"
 
 #include <set>
 
diff --git a/webkit/fileapi/sandbox_origin_database.h b/webkit/browser/fileapi/sandbox_origin_database.h
index c65991a0..f804d29 100644
--- a/webkit/fileapi/sandbox_origin_database.h
+++ b/webkit/browser/fileapi/sandbox_origin_database.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_SANDBOX_ORIGIN_DATABASE_H_
-#define WEBKIT_FILEAPI_SANDBOX_ORIGIN_DATABASE_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_ORIGIN_DATABASE_H_
+#define WEBKIT_BROWSER_FILEAPI_SANDBOX_ORIGIN_DATABASE_H_
 
 #include <string>
 #include <utility>
@@ -79,4 +79,4 @@ class WEBKIT_STORAGE_EXPORT_PRIVATE SandboxOriginDatabase {
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SANDBOX_ORIGIN_DATABASE_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_ORIGIN_DATABASE_H_
diff --git a/webkit/fileapi/sandbox_origin_database_unittest.cc b/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
index 06f8a14..c75b5a8 100644
--- a/webkit/fileapi/sandbox_origin_database_unittest.cc
+++ b/webkit/browser/fileapi/sandbox_origin_database_unittest.cc
@@ -15,9 +15,9 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/db/filename.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
+#include "webkit/browser/fileapi/sandbox_database_test_helper.h"
+#include "webkit/browser/fileapi/sandbox_origin_database.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/sandbox_database_test_helper.h"
-#include "webkit/fileapi/sandbox_origin_database.h"
 
 namespace fileapi {
 
diff --git a/webkit/fileapi/sandbox_quota_observer.cc b/webkit/browser/fileapi/sandbox_quota_observer.cc
index 100d33f..e6e9422 100644
--- a/webkit/fileapi/sandbox_quota_observer.cc
+++ b/webkit/browser/fileapi/sandbox_quota_observer.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/fileapi/sandbox_quota_observer.h"
+#include "webkit/browser/fileapi/sandbox_quota_observer.h"
 
 #include "base/sequenced_task_runner.h"
 #include "webkit/browser/fileapi/file_system_usage_cache.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/quota_client.h"
 #include "webkit/quota/quota_manager.h"
 
diff --git a/webkit/fileapi/sandbox_quota_observer.h b/webkit/browser/fileapi/sandbox_quota_observer.h
index 801e63e..0366e786 100644
--- a/webkit/fileapi/sandbox_quota_observer.h
+++ b/webkit/browser/fileapi/sandbox_quota_observer.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_SANDBOX_QUOTA_OBSERVER_H_
-#define WEBKIT_FILEAPI_SANDBOX_QUOTA_OBSERVER_H_
+#ifndef WEBKIT_BROWSER_FILEAPI_SANDBOX_QUOTA_OBSERVER_H_
+#define WEBKIT_BROWSER_FILEAPI_SANDBOX_QUOTA_OBSERVER_H_
 
 #include <map>
 
@@ -80,4 +80,4 @@ class SandboxQuotaObserver
 
 }  // namespace fileapi
 
-#endif  // WEBKIT_FILEAPI_SANDBOX_QUOTA_OBSERVER_H_
+#endif  // WEBKIT_BROWSER_FILEAPI_SANDBOX_QUOTA_OBSERVER_H_
diff --git a/webkit/browser/fileapi/webkit_browser_fileapi.gypi b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
index c4a3cda..45ad5a0 100644
--- a/webkit/browser/fileapi/webkit_browser_fileapi.gypi
+++ b/webkit/browser/fileapi/webkit_browser_fileapi.gypi
@@ -14,6 +14,18 @@
       '../browser/fileapi/file_system_url_request_job_factory.h',
       '../browser/fileapi/file_system_usage_cache.cc',
       '../browser/fileapi/file_system_usage_cache.h',
+      '../browser/fileapi/obfuscated_file_util.cc',
+      '../browser/fileapi/obfuscated_file_util.h',
+      '../browser/fileapi/sandbox_directory_database.cc',
+      '../browser/fileapi/sandbox_directory_database.h',
+      '../browser/fileapi/sandbox_file_stream_writer.cc',
+      '../browser/fileapi/sandbox_file_stream_writer.h',
+      '../browser/fileapi/sandbox_mount_point_provider.cc',
+      '../browser/fileapi/sandbox_mount_point_provider.h',
+      '../browser/fileapi/sandbox_origin_database.cc',
+      '../browser/fileapi/sandbox_origin_database.h',
+      '../browser/fileapi/sandbox_quota_observer.cc',
+      '../browser/fileapi/sandbox_quota_observer.h',
     ],
   },
 }
diff --git a/webkit/fileapi/dump_file_system.cc b/webkit/fileapi/dump_file_system.cc
index f9be7da..452dc5f 100644
--- a/webkit/fileapi/dump_file_system.cc
+++ b/webkit/fileapi/dump_file_system.cc
@@ -38,12 +38,12 @@
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
+#include "webkit/browser/fileapi/obfuscated_file_util.h"
+#include "webkit/browser/fileapi/sandbox_directory_database.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
+#include "webkit/browser/fileapi/sandbox_origin_database.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/obfuscated_file_util.h"
-#include "webkit/fileapi/sandbox_directory_database.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
-#include "webkit/fileapi/sandbox_origin_database.h"
 
 namespace {
 
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc
index 0d96886..a0d2f45 100644
--- a/webkit/fileapi/file_system_context.cc
+++ b/webkit/fileapi/file_system_context.cc
@@ -9,6 +9,7 @@
 #include "base/stl_util.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/blob/file_stream_reader.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"
@@ -22,7 +23,6 @@
 #include "webkit/fileapi/isolated_context.h"
 #include "webkit/fileapi/isolated_mount_point_provider.h"
 #include "webkit/fileapi/mount_points.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/syncable/local_file_change_tracker.h"
 #include "webkit/fileapi/syncable/local_file_sync_context.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
diff --git a/webkit/fileapi/file_system_file_stream_reader_unittest.cc b/webkit/fileapi/file_system_file_stream_reader_unittest.cc
index 7edac14..2e07bd6 100644
--- a/webkit/fileapi/file_system_file_stream_reader_unittest.cc
+++ b/webkit/fileapi/file_system_file_stream_reader_unittest.cc
@@ -15,12 +15,12 @@
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/external_mount_points.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/mock_file_system_context.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 namespace fileapi {
 
diff --git a/webkit/fileapi/file_system_quota_client.cc b/webkit/fileapi/file_system_quota_client.cc
index efee4a5..9be7d74 100644
--- a/webkit/fileapi/file_system_quota_client.cc
+++ b/webkit/fileapi/file_system_quota_client.cc
@@ -19,11 +19,11 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/net_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"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 using quota::StorageType;
 
diff --git a/webkit/fileapi/file_system_quota_client_unittest.cc b/webkit/fileapi/file_system_quota_client_unittest.cc
index ab11779..7139a43 100644
--- a/webkit/fileapi/file_system_quota_client_unittest.cc
+++ b/webkit/fileapi/file_system_quota_client_unittest.cc
@@ -12,14 +12,14 @@
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.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"
-#include "webkit/fileapi/obfuscated_file_util.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/quota_types.h"
 
 namespace fileapi {
diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc
index f118d01..a5fe626 100644
--- a/webkit/fileapi/file_writer_delegate_unittest.cc
+++ b/webkit/fileapi/file_writer_delegate_unittest.cc
@@ -17,6 +17,7 @@
 #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/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"
@@ -24,7 +25,6 @@
 #include "webkit/fileapi/file_writer_delegate.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/mock_file_system_context.h"
-#include "webkit/fileapi/sandbox_file_stream_writer.h"
 
 namespace fileapi {
 
diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc
index 59dd4f0..ba82ab0 100644
--- a/webkit/fileapi/local_file_system_operation.cc
+++ b/webkit/fileapi/local_file_system_operation.cc
@@ -12,6 +12,7 @@
 #include "net/url_request/url_request_context.h"
 #include "webkit/blob/shareable_file_reference.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"
@@ -24,7 +25,6 @@
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/file_writer_delegate.h"
 #include "webkit/fileapi/remove_operation_delegate.h"
-#include "webkit/fileapi/sandbox_file_stream_writer.h"
 #include "webkit/quota/quota_manager.h"
 #include "webkit/quota/quota_types.h"
 
diff --git a/webkit/fileapi/local_file_system_test_helper.cc b/webkit/fileapi/local_file_system_test_helper.cc
index eae6dea..cacbc0e 100644
--- a/webkit/fileapi/local_file_system_test_helper.cc
+++ b/webkit/fileapi/local_file_system_test_helper.cc
@@ -9,6 +9,7 @@
 #include "base/message_loop_proxy.h"
 #include "googleurl/src/gurl.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_file_util.h"
 #include "webkit/fileapi/file_system_operation_context.h"
@@ -17,7 +18,6 @@
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/mock_file_system_context.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
 namespace fileapi {
diff --git a/webkit/fileapi/syncable/canned_syncable_file_system.cc b/webkit/fileapi/syncable/canned_syncable_file_system.cc
index 97efe2a..06dff75 100644
--- a/webkit/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/fileapi/syncable/canned_syncable_file_system.cc
@@ -14,13 +14,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/blob/mock_blob_url_request_context.h"
 #include "webkit/browser/fileapi/file_system_mount_point_provider.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.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/local_file_system_operation.h"
 #include "webkit/fileapi/mock_file_system_options.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/syncable/local_file_change_tracker.h"
 #include "webkit/fileapi/syncable/local_file_sync_context.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
diff --git a/webkit/fileapi/syncable/syncable_file_system_operation.cc b/webkit/fileapi/syncable/syncable_file_system_operation.cc
index ce367c8..8b9e4dd 100644
--- a/webkit/fileapi/syncable/syncable_file_system_operation.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_operation.cc
@@ -6,10 +6,10 @@
 
 #include "base/logging.h"
 #include "webkit/blob/shareable_file_reference.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_url.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/syncable/local_file_sync_context.h"
 #include "webkit/fileapi/syncable/syncable_file_operation_runner.h"
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
diff --git a/webkit/fileapi/syncable/syncable_file_system_util.cc b/webkit/fileapi/syncable/syncable_file_system_util.cc
index 2f2c48a..59f3b0b 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_util.cc
@@ -5,11 +5,11 @@
 #include "webkit/fileapi/syncable/syncable_file_system_util.h"
 
 #include "base/command_line.h"
+#include "webkit/browser/fileapi/sandbox_mount_point_provider.h"
 #include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_observers.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_util.h"
-#include "webkit/fileapi/sandbox_mount_point_provider.h"
 
 using fileapi::ExternalMountPoints;
 using fileapi::FileSystemContext;
diff --git a/webkit/fileapi/test_mount_point_provider.cc b/webkit/fileapi/test_mount_point_provider.cc
index 5c9b011..b5c3a2d 100644
--- a/webkit/fileapi/test_mount_point_provider.cc
+++ b/webkit/fileapi/test_mount_point_provider.cc
@@ -10,6 +10,7 @@
 
 #include "base/file_util.h"
 #include "base/sequenced_task_runner.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"
@@ -19,7 +20,6 @@
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/local_file_util.h"
 #include "webkit/fileapi/native_file_util.h"
-#include "webkit/fileapi/sandbox_file_stream_writer.h"
 #include "webkit/quota/quota_manager.h"
 
 namespace fileapi {
diff --git a/webkit/fileapi/webkit_fileapi.gypi b/webkit/fileapi/webkit_fileapi.gypi
index 1eb8001..5c23f1f 100644
--- a/webkit/fileapi/webkit_fileapi.gypi
+++ b/webkit/fileapi/webkit_fileapi.gypi
@@ -57,23 +57,11 @@
       '../fileapi/mount_points.h',
       '../fileapi/native_file_util.cc',
       '../fileapi/native_file_util.h',
-      '../fileapi/obfuscated_file_util.cc',
-      '../fileapi/obfuscated_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',
-      '../fileapi/sandbox_directory_database.cc',
-      '../fileapi/sandbox_directory_database.h',
-      '../fileapi/sandbox_file_stream_writer.cc',
-      '../fileapi/sandbox_file_stream_writer.h',
-      '../fileapi/sandbox_mount_point_provider.cc',
-      '../fileapi/sandbox_mount_point_provider.h',
-      '../fileapi/sandbox_origin_database.cc',
-      '../fileapi/sandbox_origin_database.h',
-      '../fileapi/sandbox_quota_observer.cc',
-      '../fileapi/sandbox_quota_observer.h',
       '../fileapi/syncable/file_change.cc',
       '../fileapi/syncable/file_change.h',
       '../fileapi/syncable/local_file_change_tracker.cc',