summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 21:31:18 +0000
committerrvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 21:31:18 +0000
commitd7dc7e54e3ebc237a3ed84cb13c0a982d51288eb (patch)
tree97ee08d604b8ee3dc01816ddc1d9717f81b52124
parent13525d67aa81205d6360b8f9c7f5f5811015b45f (diff)
downloadchromium_src-d7dc7e54e3ebc237a3ed84cb13c0a982d51288eb.zip
chromium_src-d7dc7e54e3ebc237a3ed84cb13c0a982d51288eb.tar.gz
chromium_src-d7dc7e54e3ebc237a3ed84cb13c0a982d51288eb.tar.bz2
Remove stray platform_file.h from webkit
BUG=322664 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271459 Review URL: https://codereview.chromium.org/289003006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271756 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/shell/app/shell_main_delegate.cc1
-rw-r--r--webkit/browser/blob/local_file_stream_reader.cc7
-rw-r--r--webkit/browser/fileapi/file_system_dir_url_request_job.cc1
-rw-r--r--webkit/browser/fileapi/file_system_file_stream_reader.cc1
-rw-r--r--webkit/browser/fileapi/file_system_url.h2
-rw-r--r--webkit/browser/fileapi/file_system_url_request_job.cc1
-rw-r--r--webkit/browser/fileapi/isolated_file_system_backend.cc1
-rw-r--r--webkit/browser/fileapi/local_file_stream_writer.cc12
-rw-r--r--webkit/browser/fileapi/local_file_stream_writer.h1
-rw-r--r--webkit/browser/fileapi/quota/open_file_handle_context.h1
-rw-r--r--webkit/browser/fileapi/sandbox_file_stream_writer.cc1
-rw-r--r--webkit/common/fileapi/file_system_util.h1
12 files changed, 11 insertions, 19 deletions
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index b7aeb6b..97ea71a 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -12,6 +12,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/path_service.h"
+#include "base/platform_file.h"
#include "cc/base/switches.h"
#include "content/public/browser/browser_main_runner.h"
#include "content/public/common/content_switches.h"
diff --git a/webkit/browser/blob/local_file_stream_reader.cc b/webkit/browser/blob/local_file_stream_reader.cc
index e5f35a6..18b1826 100644
--- a/webkit/browser/blob/local_file_stream_reader.cc
+++ b/webkit/browser/blob/local_file_stream_reader.cc
@@ -8,7 +8,6 @@
#include "base/files/file_util_proxy.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/platform_file.h"
#include "base/task_runner.h"
#include "net/base/file_stream.h"
#include "net/base/io_buffer.h"
@@ -18,9 +17,9 @@ namespace webkit_blob {
namespace {
-const int kOpenFlagsForRead = base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_READ |
- base::PLATFORM_FILE_ASYNC;
+const int kOpenFlagsForRead = base::File::FLAG_OPEN |
+ base::File::FLAG_READ |
+ base::File::FLAG_ASYNC;
} // namespace
diff --git a/webkit/browser/fileapi/file_system_dir_url_request_job.cc b/webkit/browser/fileapi/file_system_dir_url_request_job.cc
index fffe739..97fe83f 100644
--- a/webkit/browser/fileapi/file_system_dir_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_dir_url_request_job.cc
@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
-#include "base/platform_file.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
diff --git a/webkit/browser/fileapi/file_system_file_stream_reader.cc b/webkit/browser/fileapi/file_system_file_stream_reader.cc
index 5624565..330d011e 100644
--- a/webkit/browser/fileapi/file_system_file_stream_reader.cc
+++ b/webkit/browser/fileapi/file_system_file_stream_reader.cc
@@ -5,7 +5,6 @@
#include "webkit/browser/fileapi/file_system_file_stream_reader.h"
#include "base/files/file_util_proxy.h"
-#include "base/platform_file.h"
#include "base/single_thread_task_runner.h"
#include "net/base/file_stream.h"
#include "net/base/io_buffer.h"
diff --git a/webkit/browser/fileapi/file_system_url.h b/webkit/browser/fileapi/file_system_url.h
index 9011203..ead0762 100644
--- a/webkit/browser/fileapi/file_system_url.h
+++ b/webkit/browser/fileapi/file_system_url.h
@@ -8,7 +8,7 @@
#include <set>
#include <string>
-#include "base/platform_file.h"
+#include "base/files/file_path.h"
#include "url/gurl.h"
#include "webkit/browser/webkit_storage_browser_export.h"
#include "webkit/common/fileapi/file_system_mount_option.h"
diff --git a/webkit/browser/fileapi/file_system_url_request_job.cc b/webkit/browser/fileapi/file_system_url_request_job.cc
index 8ccc5bb..d8f610d 100644
--- a/webkit/browser/fileapi/file_system_url_request_job.cc
+++ b/webkit/browser/fileapi/file_system_url_request_job.cc
@@ -12,7 +12,6 @@
#include "base/files/file_util_proxy.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/platform_file.h"
#include "base/threading/thread_restrictions.h"
#include "base/time/time.h"
#include "build/build_config.h"
diff --git a/webkit/browser/fileapi/isolated_file_system_backend.cc b/webkit/browser/fileapi/isolated_file_system_backend.cc
index 9894488..33c22cb 100644
--- a/webkit/browser/fileapi/isolated_file_system_backend.cc
+++ b/webkit/browser/fileapi/isolated_file_system_backend.cc
@@ -11,7 +11,6 @@
#include "base/files/file_util_proxy.h"
#include "base/logging.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/platform_file.h"
#include "base/sequenced_task_runner.h"
#include "webkit/browser/blob/file_stream_reader.h"
#include "webkit/browser/fileapi/async_file_util_adapter.h"
diff --git a/webkit/browser/fileapi/local_file_stream_writer.cc b/webkit/browser/fileapi/local_file_stream_writer.cc
index a6c6a51..22864c0 100644
--- a/webkit/browser/fileapi/local_file_stream_writer.cc
+++ b/webkit/browser/fileapi/local_file_stream_writer.cc
@@ -14,12 +14,12 @@ namespace fileapi {
namespace {
-const int kOpenFlagsForWrite = base::PLATFORM_FILE_OPEN |
- base::PLATFORM_FILE_WRITE |
- base::PLATFORM_FILE_ASYNC;
-const int kCreateFlagsForWrite = base::PLATFORM_FILE_CREATE |
- base::PLATFORM_FILE_WRITE |
- base::PLATFORM_FILE_ASYNC;
+const int kOpenFlagsForWrite = base::File::FLAG_OPEN |
+ base::File::FLAG_WRITE |
+ base::File::FLAG_ASYNC;
+const int kCreateFlagsForWrite = base::File::FLAG_CREATE |
+ base::File::FLAG_WRITE |
+ base::File::FLAG_ASYNC;
} // namespace
diff --git a/webkit/browser/fileapi/local_file_stream_writer.h b/webkit/browser/fileapi/local_file_stream_writer.h
index 062bd33..47bea5d 100644
--- a/webkit/browser/fileapi/local_file_stream_writer.h
+++ b/webkit/browser/fileapi/local_file_stream_writer.h
@@ -13,7 +13,6 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "base/platform_file.h"
#include "base/task_runner.h"
#include "webkit/browser/fileapi/file_stream_writer.h"
#include "webkit/browser/webkit_storage_browser_export.h"
diff --git a/webkit/browser/fileapi/quota/open_file_handle_context.h b/webkit/browser/fileapi/quota/open_file_handle_context.h
index 9bc33a2..5b0cbcb9c 100644
--- a/webkit/browser/fileapi/quota/open_file_handle_context.h
+++ b/webkit/browser/fileapi/quota/open_file_handle_context.h
@@ -11,7 +11,6 @@
#include "base/files/file_path.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
-#include "base/platform_file.h"
#include "url/gurl.h"
#include "webkit/browser/webkit_storage_browser_export.h"
#include "webkit/common/fileapi/file_system_types.h"
diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.cc b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
index aecaccd..f5efaa6 100644
--- a/webkit/browser/fileapi/sandbox_file_stream_writer.cc
+++ b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
@@ -5,7 +5,6 @@
#include "webkit/browser/fileapi/sandbox_file_stream_writer.h"
#include "base/files/file_util_proxy.h"
-#include "base/platform_file.h"
#include "base/sequenced_task_runner.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/webkit/common/fileapi/file_system_util.h b/webkit/common/fileapi/file_system_util.h
index d077cbf..9bf8424 100644
--- a/webkit/common/fileapi/file_system_util.h
+++ b/webkit/common/fileapi/file_system_util.h
@@ -10,7 +10,6 @@
#include "base/files/file.h"
#include "base/files/file_path.h"
-#include "base/platform_file.h"
#include "third_party/WebKit/public/platform/WebFileError.h"
#include "third_party/WebKit/public/platform/WebFileSystemType.h"
#include "webkit/common/fileapi/file_system_info.h"