Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / net / url_request / url_fetcher_response_writer.cc

diff --git a/src/net/url_request/url_fetcher_response_writer.cc b/src/net/url_request/url_fetcher_response_writer.cc
index 7d3c271..fcc8cbf 100644 (file)
--- a/src/net/url_request/url_fetcher_response_writer.cc
+++ b/src/net/url_request/url_fetcher_response_writer.cc
@@ -4,7 +4,7 @@
 
 #include "net/url_request/url_fetcher_response_writer.h"
 
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/sequenced_task_runner.h"
 #include "base/task_runner_util.h"
@@ -52,10 +52,10 @@ URLFetcherStringWriter* URLFetcherStringWriter::AsStringWriter() {
 URLFetcherFileWriter::URLFetcherFileWriter(
     scoped_refptr<base::SequencedTaskRunner> file_task_runner,
     const base::FilePath& file_path)
-    : weak_factory_(this),
-      file_task_runner_(file_task_runner),
+    : file_task_runner_(file_task_runner),
       file_path_(file_path),
-      owns_file_(false) {
+      owns_file_(false),
+      weak_factory_(this) {
   DCHECK(file_task_runner_.get());
 }
 
@@ -64,7 +64,7 @@ URLFetcherFileWriter::~URLFetcherFileWriter() {
 }
 
 int URLFetcherFileWriter::Initialize(const CompletionCallback& callback) {
-  file_stream_.reset(new FileStream(NULL));
+  file_stream_.reset(new FileStream(file_task_runner_));
 
   int result = ERR_IO_PENDING;
   if (file_path_.empty()) {
@@ -80,8 +80,8 @@ int URLFetcherFileWriter::Initialize(const CompletionCallback& callback) {
   } else {
     result = file_stream_->Open(
         file_path_,
-        base::PLATFORM_FILE_WRITE | base::PLATFORM_FILE_ASYNC |
-        base::PLATFORM_FILE_CREATE_ALWAYS,
+        base::File::FLAG_WRITE | base::File::FLAG_ASYNC |
+        base::File::FLAG_CREATE_ALWAYS,
         base::Bind(&URLFetcherFileWriter::DidOpenFile,
                    weak_factory_.GetWeakPtr(),
                    callback));
@@ -162,8 +162,8 @@ void URLFetcherFileWriter::DidCreateTempFile(const CompletionCallback& callback,
   owns_file_ = true;
   const int result = file_stream_->Open(
       file_path_,
-      base::PLATFORM_FILE_WRITE | base::PLATFORM_FILE_ASYNC |
-      base::PLATFORM_FILE_OPEN,
+      base::File::FLAG_WRITE | base::File::FLAG_ASYNC |
+      base::File::FLAG_OPEN,
       base::Bind(&URLFetcherFileWriter::DidOpenFile,
                  weak_factory_.GetWeakPtr(),
                  callback));