Make ByteStream independent from DownloadInterruptReason

content/browser/download/download_browsertest.cc

Index: content/browser/download/download_browsertest.cc
diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc
index 79ad19c983936b5cd33652a8c8b7389783fb658a..c4675dbed13db8704cb469e9ef6cffdaaf256710 100644
--- a/content/browser/download/download_browsertest.cc
+++ b/content/browser/download/download_browsertest.cc
@@ -19,6 +19,7 @@
 #include "content/browser/download/download_resource_handler.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
+#include "content/public/browser/download_interrupt_reasons.h"
 #include "content/public/browser/power_save_blocker.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/webplugininfo.h"
@@ -104,7 +105,7 @@ class DownloadFileWithDelay : public DownloadFileImpl {
       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,
@@ -152,7 +153,7 @@ class DownloadFileWithDelayFactory : public DownloadFileFactory {
       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,
       base::WeakPtr<DownloadDestinationObserver> observer) OVERRIDE;
 
@@ -176,7 +177,7 @@ DownloadFileWithDelay::DownloadFileWithDelay(
     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,
@@ -229,7 +230,7 @@ DownloadFile* DownloadFileWithDelayFactory::CreateFile(
     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,
     base::WeakPtr<DownloadDestinationObserver> observer) {
   scoped_ptr<PowerSaveBlocker> psb(
@@ -273,7 +274,7 @@ class CountingDownloadFile : public DownloadFileImpl {
     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)
@@ -330,7 +331,7 @@ class CountingDownloadFileFactory : public DownloadFileFactory {
     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,
     base::WeakPtr<DownloadDestinationObserver> observer) OVERRIDE {
     scoped_ptr<PowerSaveBlocker> psb(
@@ -514,7 +515,8 @@ class DownloadContentTest : public ContentBrowserTest {
   // socket layer implementation.
   int GetSafeBufferChunk() const {
     return (DownloadResourceHandler::kDownloadByteStreamSize /
-       ByteStreamWriter::kFractionBufferBeforeSending) + 1;
+            ByteStreamWriter<DownloadInterruptReason>::
+            kFractionBufferBeforeSending) + 1;
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {