summaryrefslogtreecommitdiffstats
path: root/webkit/browser/fileapi
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 03:09:43 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 03:09:43 +0000
commitb76b556d6c09aaa3f52755d765e50446fe800520 (patch)
tree9a57d757f02079112522f8510d487802d78b027a /webkit/browser/fileapi
parent272279c609dd750e5e84ebe0bac21f1e877e49c2 (diff)
downloadchromium_src-b76b556d6c09aaa3f52755d765e50446fe800520.zip
chromium_src-b76b556d6c09aaa3f52755d765e50446fe800520.tar.gz
chromium_src-b76b556d6c09aaa3f52755d765e50446fe800520.tar.bz2
Move webkit/blob to new locations. Also move content::WebBlobRegistryImpl to the new common_child library.
- just moving the files in the source repository - and fixing up complilation guards - and fixing up include paths throughout - and fixing up DEPs files as needed Note: Everything in /webkit is still being built into the same old webkit_storage target for now, new actual build target(s) will come later. TBR=kinuko@chromium.org, thestig@chromium.org BUG=239109 Review URL: https://codereview.chromium.org/15746017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/browser/fileapi')
-rw-r--r--webkit/browser/fileapi/async_file_util_adapter.cc2
-rw-r--r--webkit/browser/fileapi/cross_operation_delegate.cc2
-rw-r--r--webkit/browser/fileapi/file_system_context.cc2
-rw-r--r--webkit/browser/fileapi/file_system_file_stream_reader.cc2
-rw-r--r--webkit/browser/fileapi/file_system_file_stream_reader.h4
-rw-r--r--webkit/browser/fileapi/file_system_file_util.h2
-rw-r--r--webkit/browser/fileapi/file_system_url_request_job.cc2
-rw-r--r--webkit/browser/fileapi/isolated_file_util.cc2
-rw-r--r--webkit/browser/fileapi/isolated_mount_point_provider.cc2
-rw-r--r--webkit/browser/fileapi/local_file_system_operation.cc2
-rw-r--r--webkit/browser/fileapi/local_file_system_operation.h2
-rw-r--r--webkit/browser/fileapi/local_file_system_operation_unittest.cc2
-rw-r--r--webkit/browser/fileapi/local_file_system_operation_write_unittest.cc8
-rw-r--r--webkit/browser/fileapi/obfuscated_file_util.h2
-rw-r--r--webkit/browser/fileapi/sandbox_file_stream_writer.cc2
-rw-r--r--webkit/browser/fileapi/syncable/canned_syncable_file_system.cc2
-rw-r--r--webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc2
-rw-r--r--webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc2
-rw-r--r--webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc2
-rw-r--r--webkit/browser/fileapi/syncable/syncable_file_system_operation.cc2
-rw-r--r--webkit/browser/fileapi/transient_file_util_unittest.cc2
-rw-r--r--webkit/browser/fileapi/upload_file_system_file_element_reader.cc2
22 files changed, 26 insertions, 26 deletions
diff --git a/webkit/browser/fileapi/async_file_util_adapter.cc b/webkit/browser/fileapi/async_file_util_adapter.cc
index e46a3ae..8fa1ba7 100644
--- a/webkit/browser/fileapi/async_file_util_adapter.cc
+++ b/webkit/browser/fileapi/async_file_util_adapter.cc
@@ -7,11 +7,11 @@
#include "base/bind.h"
#include "base/sequenced_task_runner.h"
#include "base/task_runner_util.h"
-#include "webkit/blob/shareable_file_reference.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_file_util.h"
#include "webkit/browser/fileapi/file_system_operation_context.h"
#include "webkit/browser/fileapi/file_system_url.h"
+#include "webkit/common/blob/shareable_file_reference.h"
#include "webkit/common/fileapi/file_system_util.h"
using base::Bind;
diff --git a/webkit/browser/fileapi/cross_operation_delegate.cc b/webkit/browser/fileapi/cross_operation_delegate.cc
index 34a0788..c953ece 100644
--- a/webkit/browser/fileapi/cross_operation_delegate.cc
+++ b/webkit/browser/fileapi/cross_operation_delegate.cc
@@ -6,12 +6,12 @@
#include "base/bind.h"
#include "base/files/file_path.h"
-#include "webkit/blob/shareable_file_reference.h"
#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation_context.h"
#include "webkit/browser/fileapi/file_system_url.h"
#include "webkit/browser/fileapi/local_file_system_operation.h"
+#include "webkit/common/blob/shareable_file_reference.h"
#include "webkit/common/fileapi/file_system_util.h"
namespace fileapi {
diff --git a/webkit/browser/fileapi/file_system_context.cc b/webkit/browser/fileapi/file_system_context.cc
index 977db2d..4664a85 100644
--- a/webkit/browser/fileapi/file_system_context.cc
+++ b/webkit/browser/fileapi/file_system_context.cc
@@ -8,7 +8,7 @@
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "googleurl/src/gurl.h"
-#include "webkit/blob/file_stream_reader.h"
+#include "webkit/browser/blob/file_stream_reader.h"
#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
#include "webkit/browser/fileapi/external_mount_points.h"
#include "webkit/browser/fileapi/file_stream_writer.h"
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.cc b/webkit/browser/fileapi/file_system_file_stream_reader.cc
index 29268a7..4c6186f 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.cc
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.cc
@@ -10,7 +10,7 @@
#include "net/base/file_stream.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
-#include "webkit/blob/local_file_stream_reader.h"
+#include "webkit/browser/blob/local_file_stream_reader.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation.h"
#include "webkit/browser/fileapi/file_system_task_runners.h"
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.h b/webkit/browser/fileapi/file_system_file_stream_reader.h
index 5a2fc9a..348f3d8 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.h
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.h
@@ -9,9 +9,9 @@
#include "base/memory/ref_counted.h"
#include "base/platform_file.h"
#include "base/time.h"
-#include "webkit/blob/file_stream_reader.h"
-#include "webkit/blob/shareable_file_reference.h"
+#include "webkit/browser/blob/file_stream_reader.h"
#include "webkit/browser/fileapi/file_system_url.h"
+#include "webkit/common/blob/shareable_file_reference.h"
#include "webkit/storage/webkit_storage_export.h"
namespace base {
diff --git a/webkit/browser/fileapi/file_system_file_util.h b/webkit/browser/fileapi/file_system_file_util.h
index fef630d..0623b46 100644
--- a/webkit/browser/fileapi/file_system_file_util.h
+++ b/webkit/browser/fileapi/file_system_file_util.h
@@ -8,7 +8,7 @@
#include "base/files/file_path.h"
#include "base/memory/scoped_ptr.h"
#include "base/platform_file.h"
-#include "webkit/blob/scoped_file.h"
+#include "webkit/common/blob/scoped_file.h"
#include "webkit/storage/webkit_storage_export.h"
namespace base {
diff --git a/webkit/browser/fileapi/file_system_url_request_job.cc b/webkit/browser/fileapi/file_system_url_request_job.cc
index 61b06ee..a08682c 100644
--- a/webkit/browser/fileapi/file_system_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job.cc
@@ -26,7 +26,7 @@
#include "net/http/http_response_info.h"
#include "net/http/http_util.h"
#include "net/url_request/url_request.h"
-#include "webkit/blob/file_stream_reader.h"
+#include "webkit/browser/blob/file_stream_reader.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/local_file_system_operation.h"
#include "webkit/common/fileapi/file_system_util.h"
diff --git a/webkit/browser/fileapi/isolated_file_util.cc b/webkit/browser/fileapi/isolated_file_util.cc
index 4ed1f8c..bd2dffc 100644
--- a/webkit/browser/fileapi/isolated_file_util.cc
+++ b/webkit/browser/fileapi/isolated_file_util.cc
@@ -8,12 +8,12 @@
#include <vector>
#include "base/file_util.h"
-#include "webkit/blob/shareable_file_reference.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation_context.h"
#include "webkit/browser/fileapi/file_system_url.h"
#include "webkit/browser/fileapi/isolated_context.h"
#include "webkit/browser/fileapi/native_file_util.h"
+#include "webkit/common/blob/shareable_file_reference.h"
using base::PlatformFileError;
using base::PlatformFileInfo;
diff --git a/webkit/browser/fileapi/isolated_mount_point_provider.cc b/webkit/browser/fileapi/isolated_mount_point_provider.cc
index 373d357..536c9a9 100644
--- a/webkit/browser/fileapi/isolated_mount_point_provider.cc
+++ b/webkit/browser/fileapi/isolated_mount_point_provider.cc
@@ -13,7 +13,7 @@
#include "base/message_loop_proxy.h"
#include "base/platform_file.h"
#include "base/sequenced_task_runner.h"
-#include "webkit/blob/local_file_stream_reader.h"
+#include "webkit/browser/blob/local_file_stream_reader.h"
#include "webkit/browser/fileapi/async_file_util_adapter.h"
#include "webkit/browser/fileapi/copy_or_move_file_validator.h"
#include "webkit/browser/fileapi/file_system_context.h"
diff --git a/webkit/browser/fileapi/local_file_system_operation.cc b/webkit/browser/fileapi/local_file_system_operation.cc
index 5d50814..a85316b 100644
--- a/webkit/browser/fileapi/local_file_system_operation.cc
+++ b/webkit/browser/fileapi/local_file_system_operation.cc
@@ -10,7 +10,6 @@
#include "base/utf_string_conversions.h"
#include "net/base/escape.h"
#include "net/url_request/url_request_context.h"
-#include "webkit/blob/shareable_file_reference.h"
#include "webkit/browser/fileapi/async_file_util.h"
#include "webkit/browser/fileapi/cross_operation_delegate.h"
#include "webkit/browser/fileapi/file_observers.h"
@@ -23,6 +22,7 @@
#include "webkit/browser/fileapi/file_writer_delegate.h"
#include "webkit/browser/fileapi/remove_operation_delegate.h"
#include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
+#include "webkit/common/blob/shareable_file_reference.h"
#include "webkit/common/fileapi/file_system_types.h"
#include "webkit/common/fileapi/file_system_util.h"
#include "webkit/quota/quota_manager.h"
diff --git a/webkit/browser/fileapi/local_file_system_operation.h b/webkit/browser/fileapi/local_file_system_operation.h
index bca7834..ee5fe8d 100644
--- a/webkit/browser/fileapi/local_file_system_operation.h
+++ b/webkit/browser/fileapi/local_file_system_operation.h
@@ -9,10 +9,10 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "webkit/blob/scoped_file.h"
#include "webkit/browser/fileapi/file_system_operation.h"
#include "webkit/browser/fileapi/file_system_url.h"
#include "webkit/browser/fileapi/file_writer_delegate.h"
+#include "webkit/common/blob/scoped_file.h"
#include "webkit/quota/quota_types.h"
#include "webkit/storage/webkit_storage_export.h"
diff --git a/webkit/browser/fileapi/local_file_system_operation_unittest.cc b/webkit/browser/fileapi/local_file_system_operation_unittest.cc
index fa995c7..fec56e3 100644
--- a/webkit/browser/fileapi/local_file_system_operation_unittest.cc
+++ b/webkit/browser/fileapi/local_file_system_operation_unittest.cc
@@ -14,13 +14,13 @@
#include "base/stringprintf.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/shareable_file_reference.h"
#include "webkit/browser/fileapi/async_file_test_helper.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_file_util.h"
#include "webkit/browser/fileapi/file_system_operation_context.h"
#include "webkit/browser/fileapi/mock_file_change_observer.h"
#include "webkit/browser/fileapi/sandbox_file_system_test_helper.h"
+#include "webkit/common/blob/shareable_file_reference.h"
#include "webkit/common/fileapi/file_system_util.h"
#include "webkit/quota/mock_quota_manager.h"
#include "webkit/quota/quota_manager.h"
diff --git a/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc b/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc
index 1cf0180..bc42130 100644
--- a/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc
+++ b/webkit/browser/fileapi/local_file_system_operation_write_unittest.cc
@@ -15,10 +15,9 @@
#include "net/url_request/url_request_job.h"
#include "net/url_request/url_request_job_factory_impl.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/blob_data.h"
-#include "webkit/blob/blob_storage_controller.h"
-#include "webkit/blob/blob_url_request_job.h"
-#include "webkit/blob/mock_blob_url_request_context.h"
+#include "webkit/browser/blob/blob_storage_controller.h"
+#include "webkit/browser/blob/blob_url_request_job.h"
+#include "webkit/browser/blob/mock_blob_url_request_context.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_file_util.h"
#include "webkit/browser/fileapi/file_system_operation.h"
@@ -27,6 +26,7 @@
#include "webkit/browser/fileapi/local_file_util.h"
#include "webkit/browser/fileapi/mock_file_change_observer.h"
#include "webkit/browser/fileapi/mock_file_system_context.h"
+#include "webkit/common/blob/blob_data.h"
#include "webkit/common/fileapi/file_system_util.h"
#include "webkit/quota/mock_quota_manager.h"
diff --git a/webkit/browser/fileapi/obfuscated_file_util.h b/webkit/browser/fileapi/obfuscated_file_util.h
index 5d717d2..c2cd8ad 100644
--- a/webkit/browser/fileapi/obfuscated_file_util.h
+++ b/webkit/browser/fileapi/obfuscated_file_util.h
@@ -13,11 +13,11 @@
#include "base/memory/scoped_ptr.h"
#include "base/platform_file.h"
#include "base/timer.h"
-#include "webkit/blob/shareable_file_reference.h"
#include "webkit/browser/fileapi/file_system_file_util.h"
#include "webkit/browser/fileapi/file_system_url.h"
#include "webkit/browser/fileapi/sandbox_directory_database.h"
#include "webkit/browser/fileapi/sandbox_origin_database.h"
+#include "webkit/common/blob/shareable_file_reference.h"
#include "webkit/common/fileapi/file_system_types.h"
#include "webkit/storage/webkit_storage_export.h"
diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.cc b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
index cef267e..161111f 100644
--- a/webkit/browser/fileapi/sandbox_file_stream_writer.cc
+++ b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
@@ -9,7 +9,7 @@
#include "base/sequenced_task_runner.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
-#include "webkit/blob/local_file_stream_reader.h"
+#include "webkit/browser/blob/local_file_stream_reader.h"
#include "webkit/browser/fileapi/file_observers.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation.h"
diff --git a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
index c03d354..19857f0 100644
--- a/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
+++ b/webkit/browser/fileapi/syncable/canned_syncable_file_system.cc
@@ -12,7 +12,7 @@
#include "base/single_thread_task_runner.h"
#include "base/task_runner_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/mock_blob_url_request_context.h"
+#include "webkit/browser/blob/mock_blob_url_request_context.h"
#include "webkit/browser/fileapi/external_mount_points.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_mount_point_provider.h"
diff --git a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
index 817438c..78fb5fe 100644
--- a/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_change_tracker_unittest.cc
@@ -14,7 +14,7 @@
#include "base/message_loop_proxy.h"
#include "base/stl_util.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/mock_blob_url_request_context.h"
+#include "webkit/browser/blob/mock_blob_url_request_context.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_task_runners.h"
#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
diff --git a/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
index e02afc4..539d43e 100644
--- a/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
+++ b/webkit/browser/fileapi/syncable/local_file_sync_context_unittest.cc
@@ -15,7 +15,7 @@
#include "base/stl_util.h"
#include "base/threading/thread.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/mock_blob_url_request_context.h"
+#include "webkit/browser/blob/mock_blob_url_request_context.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_operation.h"
#include "webkit/browser/fileapi/isolated_context.h"
diff --git a/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc b/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc
index 2313a92..77cbb1b 100644
--- a/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_operation_runner_unittest.cc
@@ -10,7 +10,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/mock_blob_url_request_context.h"
+#include "webkit/browser/blob/mock_blob_url_request_context.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/syncable/canned_syncable_file_system.h"
#include "webkit/browser/fileapi/syncable/local_file_change_tracker.h"
diff --git a/webkit/browser/fileapi/syncable/syncable_file_system_operation.cc b/webkit/browser/fileapi/syncable/syncable_file_system_operation.cc
index 7a7dc33..6f0e5e5 100644
--- a/webkit/browser/fileapi/syncable/syncable_file_system_operation.cc
+++ b/webkit/browser/fileapi/syncable/syncable_file_system_operation.cc
@@ -5,7 +5,6 @@
#include "webkit/browser/fileapi/syncable/syncable_file_system_operation.h"
#include "base/logging.h"
-#include "webkit/blob/shareable_file_reference.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"
@@ -13,6 +12,7 @@
#include "webkit/browser/fileapi/syncable/local_file_sync_context.h"
#include "webkit/browser/fileapi/syncable/syncable_file_operation_runner.h"
#include "webkit/browser/fileapi/syncable/syncable_file_system_util.h"
+#include "webkit/common/blob/shareable_file_reference.h"
using fileapi::FileSystemURL;
using fileapi::FileSystemOperationContext;
diff --git a/webkit/browser/fileapi/transient_file_util_unittest.cc b/webkit/browser/fileapi/transient_file_util_unittest.cc
index 2b774f5..69d2c0a 100644
--- a/webkit/browser/fileapi/transient_file_util_unittest.cc
+++ b/webkit/browser/fileapi/transient_file_util_unittest.cc
@@ -10,12 +10,12 @@
#include "base/message_loop.h"
#include "base/platform_file.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/blob/scoped_file.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/mock_file_system_context.h"
#include "webkit/browser/fileapi/transient_file_util.h"
+#include "webkit/common/blob/scoped_file.h"
namespace fileapi {
diff --git a/webkit/browser/fileapi/upload_file_system_file_element_reader.cc b/webkit/browser/fileapi/upload_file_system_file_element_reader.cc
index f5d47f9..3fb5ab4 100644
--- a/webkit/browser/fileapi/upload_file_system_file_element_reader.cc
+++ b/webkit/browser/fileapi/upload_file_system_file_element_reader.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "net/base/net_errors.h"
-#include "webkit/blob/file_stream_reader.h"
+#include "webkit/browser/blob/file_stream_reader.h"
#include "webkit/browser/fileapi/file_system_context.h"
#include "webkit/browser/fileapi/file_system_url.h"