Revert 161054 - Cleanup includes/headers in webkit/fileapi

[Build failure on Windows.]

BUG=none
TEST=none

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

TBR=kinuko@chromium.org
Review URL: https://codereview.chromium.org/11028109

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

12 files changed, 33 insertions, 17 deletions

diff --git a/webkit/fileapi/file_system_context.h b/webkit/fileapi/file_system_context.h
index d3ea22e..e870ed7 100644
--- a/webkit/fileapi/file_system_context.h
+++ b/webkit/fileapi/file_system_context.h
@@ -16,12 +16,12 @@
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/fileapi_export.h"
 #include "webkit/fileapi/task_runner_bound_observer_list.h"
+#include "webkit/quota/special_storage_policy.h"
 
 class FilePath;
 
 namespace quota {
 class QuotaManagerProxy;
-class SpecialStoragePolicy;
 }
 
 namespace webkit_blob {
diff --git a/webkit/fileapi/file_system_operation.h b/webkit/fileapi/file_system_operation.h
index 4e05bf4..ab4bb80 100644
--- a/webkit/fileapi/file_system_operation.h
+++ b/webkit/fileapi/file_system_operation.h
@@ -16,6 +16,7 @@ class Time;
 }  // namespace base
 
 namespace net {
+class URLRequest;
 class URLRequestContext;
 }  // namespace net
 
diff --git a/webkit/fileapi/file_system_operation_context.cc b/webkit/fileapi/file_system_operation_context.cc
index 9597954..a1df9a6 100644
--- a/webkit/fileapi/file_system_operation_context.cc
+++ b/webkit/fileapi/file_system_operation_context.cc
@@ -4,7 +4,7 @@
 
 #include "webkit/fileapi/file_system_operation_context.h"
 
-#include "base/sequenced_task_runner.h"
+#include "base/single_thread_task_runner.h"
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 
diff --git a/webkit/fileapi/file_system_operation_context.h b/webkit/fileapi/file_system_operation_context.h
index f1fd0bc..ff67309 100644
--- a/webkit/fileapi/file_system_operation_context.h
+++ b/webkit/fileapi/file_system_operation_context.h
@@ -5,7 +5,13 @@
 #ifndef WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_CONTEXT_H_
 #define WEBKIT_FILEAPI_FILE_SYSTEM_OPERATION_CONTEXT_H_
 
+#include "base/logging.h"
 #include "base/memory/ref_counted.h"
+#include "base/sequenced_task_runner.h"
+#include "googleurl/src/gurl.h"
+#include "webkit/fileapi/file_system_context.h"
+#include "webkit/fileapi/file_system_file_util.h"
+#include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/fileapi_export.h"
 #include "webkit/fileapi/media/mtp_device_file_system_config.h"
 #include "webkit/fileapi/task_runner_bound_observer_list.h"
@@ -14,13 +20,8 @@
 #include "webkit/fileapi/media/mtp_device_delegate.h"
 #endif
 
-namespace base {
-class SequencedTaskRunner;
-}
-
 namespace fileapi {
 
-class FileSystemContext;
 class MediaPathFilter;
 
 class FILEAPI_EXPORT_PRIVATE FileSystemOperationContext {
diff --git a/webkit/fileapi/file_system_url.h b/webkit/fileapi/file_system_url.h
index 12f465a..4a9ade9 100644
--- a/webkit/fileapi/file_system_url.h
+++ b/webkit/fileapi/file_system_url.h
@@ -7,6 +7,7 @@
 
 #include <string>
 
+#include "base/file_path.h"
 #include "base/platform_file.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_types.h"
diff --git a/webkit/fileapi/file_writer_delegate_unittest.cc b/webkit/fileapi/file_writer_delegate_unittest.cc
index ebecd5b..06176ad 100644
--- a/webkit/fileapi/file_writer_delegate_unittest.cc
+++ b/webkit/fileapi/file_writer_delegate_unittest.cc
@@ -21,7 +21,6 @@
 #include "webkit/fileapi/local_file_system_operation.h"
 #include "webkit/fileapi/local_file_system_test_helper.h"
 #include "webkit/fileapi/sandbox_file_stream_writer.h"
-#include "webkit/quota/quota_manager.h"
 
 namespace fileapi {
 
diff --git a/webkit/fileapi/local_file_system_operation.cc b/webkit/fileapi/local_file_system_operation.cc
index e9048f1..3e415a7 100644
--- a/webkit/fileapi/local_file_system_operation.cc
+++ b/webkit/fileapi/local_file_system_operation.cc
@@ -15,6 +15,7 @@
 #include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_util_proxy.h"
 #include "webkit/fileapi/file_system_mount_point_provider.h"
+#include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
diff --git a/webkit/fileapi/local_file_system_operation.h b/webkit/fileapi/local_file_system_operation.h
index f33f3a1..591de42 100644
--- a/webkit/fileapi/local_file_system_operation.h
+++ b/webkit/fileapi/local_file_system_operation.h
@@ -5,26 +5,44 @@
 #ifndef WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_
 #define WEBKIT_FILEAPI_LOCAL_FILE_SYSTEM_OPERATION_H_
 
+#include <string>
 #include <vector>
 
+#include "base/file_path.h"
+#include "base/file_util_proxy.h"
+#include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
-#include "webkit/fileapi/file_system_file_util.h"
+#include "base/platform_file.h"
+#include "base/process.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_operation_context.h"
+#include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_writer_delegate.h"
 #include "webkit/fileapi/fileapi_export.h"
-#include "webkit/quota/quota_types.h"
+#include "webkit/quota/quota_manager.h"
+
+namespace base {
+class Time;
+}
 
 namespace chromeos {
 class CrosMountPointProvider;
 }
 
+namespace net {
+class URLRequest;
+class URLRequestContext;
+}  // namespace net
+
 namespace fileapi {
 
 class FileSystemContext;
+class FileSystemOperationTest;
+class FileSystemURL;
+class FileWriterDelegate;
 
 // FileSystemOperation implementation for local file systems.
 class FILEAPI_EXPORT LocalFileSystemOperation
diff --git a/webkit/fileapi/sandbox_mount_point_provider.cc b/webkit/fileapi/sandbox_mount_point_provider.cc
index cd73c62..b1d6a42 100644
--- a/webkit/fileapi/sandbox_mount_point_provider.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider.cc
@@ -16,7 +16,6 @@
 #include "base/task_runner_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
-#include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_file_stream_reader.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_options.h"
diff --git a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
index 20f56c0..0c665af 100644
--- a/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
+++ b/webkit/fileapi/sandbox_mount_point_provider_unittest.cc
@@ -23,15 +23,11 @@
 #include "webkit/fileapi/file_system_mount_point_provider.h"
 #include "webkit/fileapi/file_system_operation_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
-#include "webkit/fileapi/file_system_url.h"
 #include "webkit/fileapi/file_system_util.h"
 #include "webkit/fileapi/file_util_helper.h"
 #include "webkit/fileapi/mock_file_system_options.h"
 #include "webkit/quota/mock_special_storage_policy.h"
 
-using base::PlatformFile;
-using base::PlatformFileError;
-
 namespace fileapi {
 
 class SandboxMountPointProviderOriginEnumeratorTest : public testing::Test {
@@ -164,7 +160,7 @@ class SandboxMountPointProviderMigrationTest : public testing::Test {
     return sandbox_provider()->GetFileUtil(kFileSystemTypeTemporary);
   }
 
-  void OnValidate(PlatformFileError result) {
+  void OnValidate(base::PlatformFileError result) {
     EXPECT_NE(base::PLATFORM_FILE_OK, result);  // We told it not to create.
   }
 
diff --git a/webkit/fileapi/syncable/syncable_file_system_unittest.cc b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
index e827e0f..68acb5a 100644
--- a/webkit/fileapi/syncable/syncable_file_system_unittest.cc
+++ b/webkit/fileapi/syncable/syncable_file_system_unittest.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/fileapi/file_system_context.h"
 #include "webkit/fileapi/file_system_task_runners.h"
 #include "webkit/fileapi/file_system_types.h"
 #include "webkit/fileapi/isolated_context.h"
diff --git a/webkit/quota/quota_manager.h b/webkit/quota/quota_manager.h
index 29aedb2..edfa1b9 100644
--- a/webkit/quota/quota_manager.h
+++ b/webkit/quota/quota_manager.h
@@ -23,6 +23,7 @@
 #include "webkit/quota/quota_client.h"
 #include "webkit/quota/quota_database.h"
 #include "webkit/quota/quota_task.h"
+#include "webkit/quota/quota_types.h"
 #include "webkit/quota/special_storage_policy.h"
 
 class FilePath;