Make ByteStream independent from DownloadInterruptReason

content/browser/download/download_file_impl.h

Index: content/browser/download/download_file_impl.h
diff --git a/content/browser/download/download_file_impl.h b/content/browser/download/download_file_impl.h
index 963ae9fc58f3b9cf8b694e580cedaf2d6ea34b00..eb1f496dde53d34da1f7ed8695e2a713a4bd2ce3 100644
--- a/content/browser/download/download_file_impl.h
+++ b/content/browser/download/download_file_impl.h
@@ -15,10 +15,12 @@
 #include "content/browser/byte_stream.h"
 #include "content/browser/download/base_file.h"
 #include "content/browser/download/rate_estimator.h"
+#include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/download_save_info.h"
 #include "net/base/net_log.h"
 
 namespace content {
+template <typename StatusType>
 class ByteStreamReader;
 class DownloadDestinationObserver;
 class DownloadManager;
@@ -41,7 +43,7 @@ class CONTENT_EXPORT DownloadFileImpl : virtual public DownloadFile {
     const GURL& url,
     const GURL& referrer_url,
     bool calculate_hash,
-    scoped_ptr<ByteStreamReader> stream,
+    scoped_ptr<ByteStreamReader<DownloadInterruptReason> > stream,
     const net::BoundNetLog& bound_net_log,
     scoped_ptr<PowerSaveBlocker> power_save_blocker,
     base::WeakPtr<DownloadDestinationObserver> observer);
@@ -87,7 +89,7 @@ class CONTENT_EXPORT DownloadFileImpl : virtual public DownloadFile {
   // TODO(rdsmith): Move this into BaseFile; requires using the same
   // stream semantics in SavePackage.  Alternatively, replace SaveFile
   // with DownloadFile and get rid of BaseFile.
-  scoped_ptr<ByteStreamReader> stream_reader_;
+  scoped_ptr<ByteStreamReader<DownloadInterruptReason> > stream_reader_;
 
   // Used to trigger progress updates.
   scoped_ptr<base::RepeatingTimer<DownloadFileImpl> > update_timer_;