Revert of [Blob] Fix for resetting reader.

storage/browser/blob/upload_blob_element_reader.h

Index: storage/browser/blob/upload_blob_element_reader.h
diff --git a/storage/browser/blob/upload_blob_element_reader.h b/storage/browser/blob/upload_blob_element_reader.h
index 47ff90d2cbc94ff58942f1f2faf7ab38987e294a..72b7244a486c0d7c02322caa442cc45916424cd3 100644
--- a/storage/browser/blob/upload_blob_element_reader.h
+++ b/storage/browser/blob/upload_blob_element_reader.h
@@ -6,15 +6,10 @@
 #define STORAGE_BROWSER_BLOB_UPLOAD_BLOB_ELEMENT_READER_H_
 
 #include "base/macros.h"
-#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/completion_callback.h"
 #include "net/base/upload_element_reader.h"
 #include "storage/browser/storage_browser_export.h"
-
-namespace base {
-class SingleThreadTaskRunner;
-}
 
 namespace net {
 class IOBuffer;
@@ -23,7 +18,6 @@
 namespace storage {
 class BlobDataHandle;
 class BlobReader;
-class FileSystemContext;
 
 // This class is a wrapper around the BlobReader to make it conform
 // to the net::UploadElementReader interface, and it also holds around the
@@ -31,9 +25,8 @@
 class STORAGE_EXPORT UploadBlobElementReader
     : NON_EXPORTED_BASE(public net::UploadElementReader) {
  public:
-  UploadBlobElementReader(scoped_ptr<BlobDataHandle> handle,
-                          FileSystemContext* file_system_context,
-                          base::SingleThreadTaskRunner* file_task_runner);
+  UploadBlobElementReader(scoped_ptr<BlobReader> reader,
+                          scoped_ptr<BlobDataHandle> handle);
   ~UploadBlobElementReader() override;
 
   int Init(const net::CompletionCallback& callback) override;
@@ -51,10 +44,8 @@
   const std::string& uuid() const;
 
  private:
+  scoped_ptr<BlobReader> reader_;
   scoped_ptr<BlobDataHandle> handle_;
-  scoped_refptr<FileSystemContext> file_system_context_;
-  scoped_refptr<base::SingleThreadTaskRunner> file_runner_;
-  scoped_ptr<BlobReader> reader_;
 
   DISALLOW_COPY_AND_ASSIGN(UploadBlobElementReader);
 };