diff options
Diffstat (limited to 'content/browser/fileapi')
19 files changed, 33 insertions, 33 deletions
diff --git a/content/browser/fileapi/blob_storage_host.h b/content/browser/fileapi/blob_storage_host.h index 38e454d..3544f39 100644 --- a/content/browser/fileapi/blob_storage_host.h +++ b/content/browser/fileapi/blob_storage_host.h @@ -12,7 +12,7 @@ #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" -#include "webkit/common/blob/blob_data.h" +#include "storage/common/blob/blob_data.h" class GURL; diff --git a/content/browser/fileapi/blob_url_request_job_unittest.cc b/content/browser/fileapi/blob_url_request_job_unittest.cc index cbe3a3b..fc899fb 100644 --- a/content/browser/fileapi/blob_url_request_job_unittest.cc +++ b/content/browser/fileapi/blob_url_request_job_unittest.cc @@ -22,12 +22,12 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job_factory_impl.h" +#include "storage/common/blob/blob_data.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/blob/blob_url_request_job.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/common/blob/blob_data.h" using storage::BlobData; using storage::BlobURLRequestJob; diff --git a/content/browser/fileapi/copy_or_move_file_validator_unittest.cc b/content/browser/fileapi/copy_or_move_file_validator_unittest.cc index 33dd9f1..a263c71 100644 --- a/content/browser/fileapi/copy_or_move_file_validator_unittest.cc +++ b/content/browser/fileapi/copy_or_move_file_validator_unittest.cc @@ -11,6 +11,8 @@ #include "content/public/test/mock_special_storage_policy.h" #include "content/public/test/test_file_system_backend.h" #include "content/public/test/test_file_system_context.h" +#include "storage/common/blob/shareable_file_reference.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/copy_or_move_file_validator.h" #include "webkit/browser/fileapi/external_mount_points.h" @@ -18,8 +20,6 @@ #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/isolated_context.h" -#include "webkit/common/blob/shareable_file_reference.h" -#include "webkit/common/fileapi/file_system_util.h" using content::AsyncFileTestHelper; using storage::CopyOrMoveFileValidator; diff --git a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc index 4092c6c..0f42e77 100644 --- a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc +++ b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc @@ -18,6 +18,7 @@ #include "content/public/test/test_file_system_backend.h" #include "content/public/test/test_file_system_context.h" #include "content/test/fileapi_test_file_set.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/blob/file_stream_reader.h" #include "webkit/browser/fileapi/copy_or_move_file_validator.h" @@ -28,7 +29,6 @@ #include "webkit/browser/fileapi/file_system_operation.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/quota/quota_manager.h" -#include "webkit/common/fileapi/file_system_util.h" using content::AsyncFileTestHelper; using storage::CopyOrMoveOperationDelegate; diff --git a/content/browser/fileapi/file_system_operation_impl_unittest.cc b/content/browser/fileapi/file_system_operation_impl_unittest.cc index 392f1c0..f9afae8 100644 --- a/content/browser/fileapi/file_system_operation_impl_unittest.cc +++ b/content/browser/fileapi/file_system_operation_impl_unittest.cc @@ -17,6 +17,8 @@ #include "content/browser/quota/mock_quota_manager_proxy.h" #include "content/public/test/async_file_test_helper.h" #include "content/public/test/sandbox_file_system_test_helper.h" +#include "storage/common/blob/shareable_file_reference.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "webkit/browser/fileapi/file_system_context.h" @@ -26,8 +28,6 @@ #include "webkit/browser/fileapi/sandbox_file_system_backend.h" #include "webkit/browser/quota/quota_manager.h" #include "webkit/browser/quota/quota_manager_proxy.h" -#include "webkit/common/blob/shareable_file_reference.h" -#include "webkit/common/fileapi/file_system_util.h" using content::AsyncFileTestHelper; using storage::FileSystemOperation; diff --git a/content/browser/fileapi/file_system_operation_impl_write_unittest.cc b/content/browser/fileapi/file_system_operation_impl_write_unittest.cc index 899bb5f9..deaf1cc 100644 --- a/content/browser/fileapi/file_system_operation_impl_write_unittest.cc +++ b/content/browser/fileapi/file_system_operation_impl_write_unittest.cc @@ -18,6 +18,8 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_factory_impl.h" +#include "storage/common/blob/blob_data.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "webkit/browser/blob/blob_storage_context.h" @@ -27,8 +29,6 @@ #include "webkit/browser/fileapi/file_system_operation_context.h" #include "webkit/browser/fileapi/file_system_operation_runner.h" #include "webkit/browser/fileapi/local_file_util.h" -#include "webkit/common/blob/blob_data.h" -#include "webkit/common/fileapi/file_system_util.h" using storage::FileSystemOperation; using storage::FileSystemOperationRunner; diff --git a/content/browser/fileapi/file_system_quota_client_unittest.cc b/content/browser/fileapi/file_system_quota_client_unittest.cc index 1760a9c..fae96f3 100644 --- a/content/browser/fileapi/file_system_quota_client_unittest.cc +++ b/content/browser/fileapi/file_system_quota_client_unittest.cc @@ -10,15 +10,15 @@ #include "base/run_loop.h" #include "content/public/test/async_file_test_helper.h" #include "content/public/test/test_file_system_context.h" +#include "storage/common/fileapi/file_system_types.h" +#include "storage/common/fileapi/file_system_util.h" +#include "storage/common/quota/quota_types.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "webkit/browser/fileapi/file_system_context.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/common/fileapi/file_system_types.h" -#include "webkit/common/fileapi/file_system_util.h" -#include "webkit/common/quota/quota_types.h" using content::AsyncFileTestHelper; using storage::FileSystemQuotaClient; diff --git a/content/browser/fileapi/file_system_url_unittest.cc b/content/browser/fileapi/file_system_url_unittest.cc index 8167cbb..c23779f 100644 --- a/content/browser/fileapi/file_system_url_unittest.cc +++ b/content/browser/fileapi/file_system_url_unittest.cc @@ -5,10 +5,10 @@ #include "webkit/browser/fileapi/file_system_url.h" #include "base/files/file_path.h" +#include "storage/common/fileapi/file_system_types.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" -#include "webkit/common/fileapi/file_system_types.h" -#include "webkit/common/fileapi/file_system_util.h" #define FPL FILE_PATH_LITERAL diff --git a/content/browser/fileapi/fileapi_message_filter.cc b/content/browser/fileapi/fileapi_message_filter.cc index 1ebac52..2f74fa2 100644 --- a/content/browser/fileapi/fileapi_message_filter.cc +++ b/content/browser/fileapi/fileapi_message_filter.cc @@ -27,18 +27,18 @@ #include "net/base/mime_util.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" +#include "storage/common/blob/blob_data.h" +#include "storage/common/blob/shareable_file_reference.h" +#include "storage/common/fileapi/directory_entry.h" +#include "storage/common/fileapi/file_system_info.h" +#include "storage/common/fileapi/file_system_types.h" +#include "storage/common/fileapi/file_system_util.h" #include "url/gurl.h" #include "webkit/browser/blob/blob_storage_context.h" #include "webkit/browser/fileapi/file_observers.h" #include "webkit/browser/fileapi/file_permission_policy.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/isolated_context.h" -#include "webkit/common/blob/blob_data.h" -#include "webkit/common/blob/shareable_file_reference.h" -#include "webkit/common/fileapi/directory_entry.h" -#include "webkit/common/fileapi/file_system_info.h" -#include "webkit/common/fileapi/file_system_types.h" -#include "webkit/common/fileapi/file_system_util.h" using storage::FileSystemFileUtil; using storage::FileSystemBackend; diff --git a/content/browser/fileapi/fileapi_message_filter.h b/content/browser/fileapi/fileapi_message_filter.h index ca4165d..a9b90f5 100644 --- a/content/browser/fileapi/fileapi_message_filter.h +++ b/content/browser/fileapi/fileapi_message_filter.h @@ -18,11 +18,11 @@ #include "content/browser/streams/stream_context.h" #include "content/common/content_export.h" #include "content/public/browser/browser_message_filter.h" +#include "storage/common/blob/blob_data.h" +#include "storage/common/fileapi/file_system_types.h" +#include "storage/common/quota/quota_types.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_operation_runner.h" -#include "webkit/common/blob/blob_data.h" -#include "webkit/common/fileapi/file_system_types.h" -#include "webkit/common/quota/quota_types.h" class GURL; diff --git a/content/browser/fileapi/fileapi_message_filter_unittest.cc b/content/browser/fileapi/fileapi_message_filter_unittest.cc index ddd3028..028c8b3 100644 --- a/content/browser/fileapi/fileapi_message_filter_unittest.cc +++ b/content/browser/fileapi/fileapi_message_filter_unittest.cc @@ -23,10 +23,10 @@ #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_file_system_context.h" #include "net/base/io_buffer.h" +#include "storage/common/blob/blob_data.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/blob/blob_storage_context.h" #include "webkit/browser/fileapi/file_system_context.h" -#include "webkit/common/blob/blob_data.h" namespace content { diff --git a/content/browser/fileapi/local_file_util_unittest.cc b/content/browser/fileapi/local_file_util_unittest.cc index afefca9..5cf15d3 100644 --- a/content/browser/fileapi/local_file_util_unittest.cc +++ b/content/browser/fileapi/local_file_util_unittest.cc @@ -14,6 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/test/async_file_test_helper.h" #include "content/public/test/test_file_system_context.h" +#include "storage/common/fileapi/file_system_types.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/async_file_util_adapter.h" #include "webkit/browser/fileapi/file_system_context.h" @@ -21,7 +22,6 @@ #include "webkit/browser/fileapi/file_system_operation_context.h" #include "webkit/browser/fileapi/local_file_util.h" #include "webkit/browser/fileapi/native_file_util.h" -#include "webkit/common/fileapi/file_system_types.h" using content::AsyncFileTestHelper; using storage::AsyncFileUtilAdapter; diff --git a/content/browser/fileapi/obfuscated_file_util_unittest.cc b/content/browser/fileapi/obfuscated_file_util_unittest.cc index b3a3a03..da2af10 100644 --- a/content/browser/fileapi/obfuscated_file_util_unittest.cc +++ b/content/browser/fileapi/obfuscated_file_util_unittest.cc @@ -19,6 +19,8 @@ #include "content/public/test/sandbox_file_system_test_helper.h" #include "content/public/test/test_file_system_context.h" #include "content/test/fileapi_test_file_set.h" +#include "storage/common/database/database_identifier.h" +#include "storage/common/quota/quota_types.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/external_mount_points.h" #include "webkit/browser/fileapi/file_system_backend.h" @@ -31,8 +33,6 @@ #include "webkit/browser/fileapi/sandbox_isolated_origin_database.h" #include "webkit/browser/fileapi/sandbox_origin_database.h" #include "webkit/browser/quota/quota_manager.h" -#include "webkit/common/database/database_identifier.h" -#include "webkit/common/quota/quota_types.h" using content::AsyncFileTestHelper; using storage::FileSystemContext; diff --git a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc index 07e07c3..333c2da 100644 --- a/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc +++ b/content/browser/fileapi/plugin_private_file_system_backend_unittest.cc @@ -12,12 +12,12 @@ #include "content/public/test/async_file_test_helper.h" #include "content/public/test/test_file_system_context.h" #include "content/public/test/test_file_system_options.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/isolated_context.h" #include "webkit/browser/fileapi/obfuscated_file_util.h" #include "webkit/browser/fileapi/plugin_private_file_system_backend.h" -#include "webkit/common/fileapi/file_system_util.h" using content::AsyncFileTestHelper; using storage::FileSystemContext; diff --git a/content/browser/fileapi/sandbox_database_test_helper.cc b/content/browser/fileapi/sandbox_database_test_helper.cc index c70f6f0..205b653 100644 --- a/content/browser/fileapi/sandbox_database_test_helper.cc +++ b/content/browser/fileapi/sandbox_database_test_helper.cc @@ -12,8 +12,8 @@ #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/stl_util.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" -#include "webkit/common/fileapi/file_system_util.h" using storage::FilePathToString; diff --git a/content/browser/fileapi/sandbox_directory_database_unittest.cc b/content/browser/fileapi/sandbox_directory_database_unittest.cc index af1dd6e..ac1b5de 100644 --- a/content/browser/fileapi/sandbox_directory_database_unittest.cc +++ b/content/browser/fileapi/sandbox_directory_database_unittest.cc @@ -14,9 +14,9 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "content/browser/fileapi/sandbox_database_test_helper.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" -#include "webkit/common/fileapi/file_system_util.h" #define FPL(x) FILE_PATH_LITERAL(x) diff --git a/content/browser/fileapi/sandbox_file_system_backend_unittest.cc b/content/browser/fileapi/sandbox_file_system_backend_unittest.cc index 37f7b41..b77aa20 100644 --- a/content/browser/fileapi/sandbox_file_system_backend_unittest.cc +++ b/content/browser/fileapi/sandbox_file_system_backend_unittest.cc @@ -13,12 +13,12 @@ #include "base/message_loop/message_loop_proxy.h" #include "base/run_loop.h" #include "content/public/test/test_file_system_options.h" +#include "storage/common/fileapi/file_system_util.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" #include "webkit/browser/fileapi/file_system_backend.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/browser/fileapi/sandbox_file_system_backend_delegate.h" -#include "webkit/common/fileapi/file_system_util.h" using storage::FileSystemURL; using storage::SandboxFileSystemBackend; diff --git a/content/browser/fileapi/sandbox_origin_database_unittest.cc b/content/browser/fileapi/sandbox_origin_database_unittest.cc index 9a6e7a8..2957294 100644 --- a/content/browser/fileapi/sandbox_origin_database_unittest.cc +++ b/content/browser/fileapi/sandbox_origin_database_unittest.cc @@ -14,11 +14,11 @@ #include "base/files/scoped_temp_dir.h" #include "base/stl_util.h" #include "content/browser/fileapi/sandbox_database_test_helper.h" +#include "storage/common/fileapi/file_system_util.h" #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_origin_database.h" -#include "webkit/common/fileapi/file_system_util.h" using storage::SandboxOriginDatabase; diff --git a/content/browser/fileapi/transient_file_util_unittest.cc b/content/browser/fileapi/transient_file_util_unittest.cc index a730b6f..cd289df 100644 --- a/content/browser/fileapi/transient_file_util_unittest.cc +++ b/content/browser/fileapi/transient_file_util_unittest.cc @@ -9,12 +9,12 @@ #include "base/memory/scoped_ptr.h" #include "base/run_loop.h" #include "content/public/test/test_file_system_context.h" +#include "storage/common/blob/scoped_file.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_operation_context.h" #include "webkit/browser/fileapi/isolated_context.h" #include "webkit/browser/fileapi/transient_file_util.h" -#include "webkit/common/blob/scoped_file.h" using storage::FileSystemURL; |