1 files changed, 8 insertions, 4 deletions
diff --git a/chromium/webkit/browser/fileapi/file_system_file_stream_reader.h b/chromium/webkit/browser/fileapi/file_system_file_stream_reader.h
index 3a90663ed95..361502237eb 100644
--- a/chromium/webkit/browser/fileapi/file_system_file_stream_reader.h
+++ b/chromium/webkit/browser/fileapi/file_system_file_stream_reader.h
@@ -6,8 +6,8 @@
 #define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_FILE_STREAM_READER_H_
 
 #include "base/bind.h"
+#include "base/files/file.h"
 #include "base/memory/ref_counted.h"
-#include "base/platform_file.h"
 #include "base/time/time.h"
 #include "webkit/browser/blob/file_stream_reader.h"
 #include "webkit/browser/fileapi/file_system_url.h"
@@ -19,6 +19,10 @@ class FilePath;
 class SequencedTaskRunner;
 }
 
+namespace content {
+class FileSystemFileStreamReaderTest;
+}
+
 namespace fileapi {
 
 class FileSystemContext;
@@ -41,7 +45,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader
 
  private:
   friend class webkit_blob::FileStreamReader;
-  friend class FileSystemFileStreamReaderTest;
+  friend class content::FileSystemFileStreamReaderTest;
 
   FileSystemFileStreamReader(FileSystemContext* file_system_context,
                              const FileSystemURL& url,
@@ -53,8 +57,8 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemFileStreamReader
   void DidCreateSnapshot(
       const base::Closure& callback,
       const net::CompletionCallback& error_callback,
-      base::PlatformFileError file_error,
-      const base::PlatformFileInfo& file_info,
+      base::File::Error file_error,
+      const base::File::Info& file_info,
       const base::FilePath& platform_path,
       const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref);