Move some file api files to fileapi folder

File file_stream_reader and local_file_stream_reader was in
storage/browser/blob, move them to storage/browser/fileapi, make it
more understandable.

BUG=456634

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

Cr-Commit-Position: refs/heads/master@{#317978}

17 files changed, 22 insertions, 22 deletions

diff --git a/storage/browser/BUILD.gn b/storage/browser/BUILD.gn
index 61e76c7a..d7f14e3 100644
--- a/storage/browser/BUILD.gn
+++ b/storage/browser/BUILD.gn
@@ -21,12 +21,8 @@ component("browser") {
     "blob/blob_url_request_job.h",
     "blob/blob_url_request_job_factory.cc",
     "blob/blob_url_request_job_factory.h",
-    "blob/file_stream_reader.cc",
-    "blob/file_stream_reader.h",
     "blob/internal_blob_data.cc",
     "blob/internal_blob_data.h",
-    "blob/local_file_stream_reader.cc",
-    "blob/local_file_stream_reader.h",
     "blob/scoped_file.cc",
     "blob/scoped_file.h",
     "blob/shareable_blob_data_item.cc",
@@ -57,6 +53,8 @@ component("browser") {
     "fileapi/external_mount_points.h",
     "fileapi/file_observers.h",
     "fileapi/file_permission_policy.h",
+    "fileapi/file_stream_reader.cc",
+    "fileapi/file_stream_reader.h",
     "fileapi/file_stream_writer.h",
     "fileapi/file_system_backend.h",
     "fileapi/file_system_context.cc",
@@ -93,6 +91,8 @@ component("browser") {
     "fileapi/isolated_context.h",
     "fileapi/isolated_file_system_backend.cc",
     "fileapi/isolated_file_system_backend.h",
+    "fileapi/local_file_stream_reader.cc",
+    "fileapi/local_file_stream_reader.h",
     "fileapi/local_file_stream_writer.cc",
     "fileapi/local_file_stream_writer.h",
     "fileapi/local_file_util.cc",
diff --git a/storage/browser/blob/blob_url_request_job.cc b/storage/browser/blob/blob_url_request_job.cc
index 068b5c4..8e48563 100644
--- a/storage/browser/blob/blob_url_request_job.cc
+++ b/storage/browser/blob/blob_url_request_job.cc
@@ -31,7 +31,7 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_status.h"
-#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "storage/common/data_element.h"
diff --git a/storage/browser/fileapi/copy_or_move_operation_delegate.cc b/storage/browser/fileapi/copy_or_move_operation_delegate.cc
index baa93db..bf3714f 100644
--- a/storage/browser/fileapi/copy_or_move_operation_delegate.cc
+++ b/storage/browser/fileapi/copy_or_move_operation_delegate.cc
@@ -8,10 +8,10 @@
 #include "base/files/file_path.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/blob/shareable_file_reference.h"
 #include "storage/browser/fileapi/copy_or_move_file_validator.h"
 #include "storage/browser/fileapi/file_observers.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_stream_writer.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation_runner.h"
diff --git a/storage/browser/blob/file_stream_reader.cc b/storage/browser/fileapi/file_stream_reader.cc
index 5c4aaa2..cb87ecb 100644
--- a/storage/browser/blob/file_stream_reader.cc
+++ b/storage/browser/fileapi/file_stream_reader.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 "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 
 #include "base/time/time.h"
 
diff --git a/storage/browser/blob/file_stream_reader.h b/storage/browser/fileapi/file_stream_reader.h
index 9b2ce02..9b2ce02 100644
--- a/storage/browser/blob/file_stream_reader.h
+++ b/storage/browser/fileapi/file_stream_reader.h
diff --git a/storage/browser/fileapi/file_system_context.cc b/storage/browser/fileapi/file_system_context.cc
index 85a9317..defccc8 100644
--- a/storage/browser/fileapi/file_system_context.cc
+++ b/storage/browser/fileapi/file_system_context.cc
@@ -9,10 +9,10 @@
 #include "base/stl_util.h"
 #include "base/task_runner_util.h"
 #include "net/url_request/url_request.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/fileapi/copy_or_move_file_validator.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "storage/browser/fileapi/file_permission_policy.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_stream_writer.h"
 #include "storage/browser/fileapi/file_system_file_util.h"
 #include "storage/browser/fileapi/file_system_operation.h"
diff --git a/storage/browser/fileapi/file_system_file_stream_reader.cc b/storage/browser/fileapi/file_system_file_stream_reader.cc
index 60a806a..d1cfd84 100644
--- a/storage/browser/fileapi/file_system_file_stream_reader.cc
+++ b/storage/browser/fileapi/file_system_file_stream_reader.cc
@@ -9,7 +9,7 @@
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation_runner.h"
 
diff --git a/storage/browser/fileapi/file_system_file_stream_reader.h b/storage/browser/fileapi/file_system_file_stream_reader.h
index c0cdeb1..41c0157 100644
--- a/storage/browser/fileapi/file_system_file_stream_reader.h
+++ b/storage/browser/fileapi/file_system_file_stream_reader.h
@@ -9,8 +9,8 @@
 #include "base/files/file.h"
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/blob/shareable_file_reference.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_system_url.h"
 #include "storage/browser/storage_browser_export.h"
 
diff --git a/storage/browser/fileapi/file_system_url_request_job.cc b/storage/browser/fileapi/file_system_url_request_job.cc
index d2c242c..edc1dde 100644
--- a/storage/browser/fileapi/file_system_url_request_job.cc
+++ b/storage/browser/fileapi/file_system_url_request_job.cc
@@ -25,7 +25,7 @@
 #include "net/http/http_response_info.h"
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
-#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation_runner.h"
 #include "storage/common/fileapi/file_system_util.h"
diff --git a/storage/browser/fileapi/isolated_file_system_backend.cc b/storage/browser/fileapi/isolated_file_system_backend.cc
index 823d404..0c8da67 100644
--- a/storage/browser/fileapi/isolated_file_system_backend.cc
+++ b/storage/browser/fileapi/isolated_file_system_backend.cc
@@ -12,10 +12,10 @@
 #include "base/logging.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/sequenced_task_runner.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/fileapi/async_file_util_adapter.h"
 #include "storage/browser/fileapi/copy_or_move_file_validator.h"
 #include "storage/browser/fileapi/dragged_file_util.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_stream_writer.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation.h"
diff --git a/storage/browser/blob/local_file_stream_reader.cc b/storage/browser/fileapi/local_file_stream_reader.cc
index e3b827c..cb219b1 100644
--- a/storage/browser/blob/local_file_stream_reader.cc
+++ b/storage/browser/fileapi/local_file_stream_reader.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 "storage/browser/blob/local_file_stream_reader.h"
+#include "storage/browser/fileapi/local_file_stream_reader.h"
 
 #include "base/files/file_util.h"
 #include "base/files/file_util_proxy.h"
diff --git a/storage/browser/blob/local_file_stream_reader.h b/storage/browser/fileapi/local_file_stream_reader.h
index ba8a348..dfc75e2 100644
--- a/storage/browser/blob/local_file_stream_reader.h
+++ b/storage/browser/fileapi/local_file_stream_reader.h
@@ -11,7 +11,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
-#include "storage/browser/blob/file_stream_reader.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/storage_browser_export.h"
 
 namespace base {
diff --git a/storage/browser/fileapi/plugin_private_file_system_backend.cc b/storage/browser/fileapi/plugin_private_file_system_backend.cc
index 6874de4..72a0cd9 100644
--- a/storage/browser/fileapi/plugin_private_file_system_backend.cc
+++ b/storage/browser/fileapi/plugin_private_file_system_backend.cc
@@ -10,8 +10,8 @@
 #include "base/synchronization/lock.h"
 #include "base/task_runner_util.h"
 #include "net/base/net_util.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/fileapi/async_file_util_adapter.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_stream_writer.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation.h"
diff --git a/storage/browser/fileapi/sandbox_file_stream_writer.cc b/storage/browser/fileapi/sandbox_file_stream_writer.cc
index d87c66d..27e363f 100644
--- a/storage/browser/fileapi/sandbox_file_stream_writer.cc
+++ b/storage/browser/fileapi/sandbox_file_stream_writer.cc
@@ -8,8 +8,8 @@
 #include "base/sequenced_task_runner.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/fileapi/file_observers.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_stream_writer.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation_runner.h"
diff --git a/storage/browser/fileapi/sandbox_file_system_backend.cc b/storage/browser/fileapi/sandbox_file_system_backend.cc
index 3b93dcf..8398c38 100644
--- a/storage/browser/fileapi/sandbox_file_system_backend.cc
+++ b/storage/browser/fileapi/sandbox_file_system_backend.cc
@@ -9,9 +9,9 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/task_runner_util.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/fileapi/async_file_util_adapter.h"
 #include "storage/browser/fileapi/copy_or_move_file_validator.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_stream_writer.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation.h"
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
index 7650e0c..cf06875b 100644
--- a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
+++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
@@ -12,8 +12,8 @@
 #include "base/stl_util.h"
 #include "base/task_runner_util.h"
 #include "net/base/net_util.h"
-#include "storage/browser/blob/file_stream_reader.h"
 #include "storage/browser/fileapi/async_file_util_adapter.h"
+#include "storage/browser/fileapi/file_stream_reader.h"
 #include "storage/browser/fileapi/file_system_context.h"
 #include "storage/browser/fileapi/file_system_operation_context.h"
 #include "storage/browser/fileapi/file_system_url.h"
diff --git a/storage/storage_browser.gyp b/storage/storage_browser.gyp
index 070eca2..6a8b749 100644
--- a/storage/storage_browser.gyp
+++ b/storage/storage_browser.gyp
@@ -39,12 +39,8 @@
         'browser/blob/blob_url_request_job.h',
         'browser/blob/blob_url_request_job_factory.cc',
         'browser/blob/blob_url_request_job_factory.h',
-        'browser/blob/file_stream_reader.cc',
-        'browser/blob/file_stream_reader.h',
         'browser/blob/internal_blob_data.cc',
         'browser/blob/internal_blob_data.h',
-        'browser/blob/local_file_stream_reader.cc',
-        'browser/blob/local_file_stream_reader.h',
         'browser/blob/scoped_file.cc',
         'browser/blob/scoped_file.h',
         'browser/blob/shareable_blob_data_item.cc',
@@ -75,6 +71,8 @@
         'browser/fileapi/external_mount_points.h',
         'browser/fileapi/file_observers.h',
         'browser/fileapi/file_permission_policy.h',
+        'browser/fileapi/file_stream_reader.cc',
+        'browser/fileapi/file_stream_reader.h',
         'browser/fileapi/file_stream_writer.h',
         'browser/fileapi/file_system_backend.h',
         'browser/fileapi/file_system_context.cc',
@@ -111,6 +109,8 @@
         'browser/fileapi/isolated_context.h',
         'browser/fileapi/isolated_file_system_backend.cc',
         'browser/fileapi/isolated_file_system_backend.h',
+        'browser/fileapi/local_file_stream_reader.cc',
+        'browser/fileapi/local_file_stream_reader.h',
         'browser/fileapi/local_file_stream_writer.cc',
         'browser/fileapi/local_file_stream_writer.h',
         'browser/fileapi/local_file_util.cc',