Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / loader / redirect_to_file_resource_handler.cc

diff --git a/src/content/browser/loader/redirect_to_file_resource_handler.cc b/src/content/browser/loader/redirect_to_file_resource_handler.cc
index caf36cd..fc47ee3 100644 (file)
--- a/src/content/browser/loader/redirect_to_file_resource_handler.cc
+++ b/src/content/browser/loader/redirect_to_file_resource_handler.cc
@@ -15,9 +15,9 @@
 #include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 #include "net/base/net_errors.h"
-#include "webkit/common/blob/shareable_file_reference.h"
+#include "storage/common/blob/shareable_file_reference.h"
 
-using webkit_blob::ShareableFileReference;
+using storage::ShareableFileReference;
 
 namespace {
 
@@ -121,7 +121,7 @@ class RedirectToFileResourceHandler::Writer {
 
   // We create a ShareableFileReference that's deletable for the temp file
   // created as a result of the download.
-  scoped_refptr<webkit_blob::ShareableFileReference> deletable_file_;
+  scoped_refptr<storage::ShareableFileReference> deletable_file_;
 
   DISALLOW_COPY_AND_ASSIGN(Writer);
 };
@@ -157,11 +157,8 @@ void RedirectToFileResourceHandler::
 bool RedirectToFileResourceHandler::OnResponseStarted(
     ResourceResponse* response,
     bool* defer) {
-  if (response->head.error_code == net::OK ||
-      response->head.error_code == net::ERR_IO_PENDING) {
-    DCHECK(writer_);
-    response->head.download_file_path = writer_->path();
-  }
+  DCHECK(writer_);
+  response->head.download_file_path = writer_->path();
   return next_handler_->OnResponseStarted(response, defer);
 }