diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp
index ffb7c23df14..76c9fbb16a9 100644
--- a/mozilla/content/html/document/src/nsImageDocument.cpp
+++ b/mozilla/content/html/document/src/nsImageDocument.cpp
@@ -84,7 +84,7 @@ public:
   NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } 
   NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } 
   // nsIStreamListener methods:
-  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
   NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
   NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax);
@@ -192,7 +192,7 @@ ImageListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
 
 NS_IMETHODIMP
 #ifdef NECKO
-ImageListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
+ImageListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
                                PRUint32 sourceOffset, PRUint32 count)
 #else
 ImageListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
diff --git a/mozilla/gfx/src/nsImageNetContextAsync.cpp b/mozilla/gfx/src/nsImageNetContextAsync.cpp
index 30844132186..121e484581c 100644
--- a/mozilla/gfx/src/nsImageNetContextAsync.cpp
+++ b/mozilla/gfx/src/nsImageNetContextAsync.cpp
@@ -117,7 +117,7 @@ public:
   NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } 
   NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
   // nsIStreamListener methods:
-  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
   NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo);
   NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax);
@@ -137,7 +137,7 @@ protected:
   PRBool mInterrupted;
   ImageNetContextImpl *mContext;
 #ifdef NECKO
-  nsIBufferInputStream *mStream;
+  nsIInputStream *mStream;
 #else
   nsIInputStream *mStream;
 #endif
@@ -220,7 +220,7 @@ ImageConsumer::OnStartBinding(nsIURI* aURL, const char *aContentType)
 
 NS_IMETHODIMP
 #ifdef NECKO
-ImageConsumer::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *pIStream,
+ImageConsumer::OnDataAvailable(nsISupports* aContext, nsIInputStream *pIStream,
                                PRUint32 offset, PRUint32 length)
 #else
 ImageConsumer::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 length)
diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp
index 30704a79656..2740b37afb4 100644
--- a/mozilla/htmlparser/src/nsParser.cpp
+++ b/mozilla/htmlparser/src/nsParser.cpp
@@ -1097,7 +1097,7 @@ nsParser::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *err
  *  @return  error code (usually 0)
  */
 #ifdef NECKO
-nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
+nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
 #else
 nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 aLength)
 #endif
diff --git a/mozilla/htmlparser/src/nsParser.h b/mozilla/htmlparser/src/nsParser.h
index 685adc2ede7..ea5806c73e1 100644
--- a/mozilla/htmlparser/src/nsParser.h
+++ b/mozilla/htmlparser/src/nsParser.h
@@ -249,7 +249,7 @@ friend class CTokenHandler;
     NS_IMETHOD OnStartRequest(nsISupports *ctxt);
     NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg);
     // nsIStreamListener methods:
-    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
     NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo);
     NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax);
diff --git a/mozilla/layout/base/src/nsPluginViewer.cpp b/mozilla/layout/base/src/nsPluginViewer.cpp
index 853d61b57f2..a3e4ef1ec38 100644
--- a/mozilla/layout/base/src/nsPluginViewer.cpp
+++ b/mozilla/layout/base/src/nsPluginViewer.cpp
@@ -69,7 +69,7 @@ public:
   NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; }
   NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; }
   // nsIStreamListener methods:
-  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
   // nsIStreamListener
   NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
@@ -692,7 +692,7 @@ PluginListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
 
 NS_IMETHODIMP
 #ifdef NECKO
-PluginListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
+PluginListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
 #else
 PluginListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
                                 PRUint32 aCount)
diff --git a/mozilla/layout/html/document/src/nsImageDocument.cpp b/mozilla/layout/html/document/src/nsImageDocument.cpp
index ffb7c23df14..76c9fbb16a9 100644
--- a/mozilla/layout/html/document/src/nsImageDocument.cpp
+++ b/mozilla/layout/html/document/src/nsImageDocument.cpp
@@ -84,7 +84,7 @@ public:
   NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } 
   NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } 
   // nsIStreamListener methods:
-  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
   NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
   NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aProgressMax);
@@ -192,7 +192,7 @@ ImageListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
 
 NS_IMETHODIMP
 #ifdef NECKO
-ImageListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr,
+ImageListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr,
                                PRUint32 sourceOffset, PRUint32 count)
 #else
 ImageListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 2fc9b40ae21..d001745ca21 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -397,7 +397,7 @@ public:
     NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
     NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
     // nsIStreamListener methods:
-    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);  
+    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);  
 
 #else
   //nsIStreamObserver interface
@@ -488,7 +488,7 @@ public:
 		const PRUnichar *errorMsg) { return NS_OK; }
 	
 	// nsIStreamListener methods:
-	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, 
+	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, 
 		PRUint32 sourceOffset, PRUint32 count);
 
 #else
@@ -666,7 +666,7 @@ nsPluginCacheListener::OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aPr
 NS_IMETHODIMP 
 #ifdef NECKO
 nsPluginCacheListener::OnDataAvailable(nsISupports* ctxt, 
-	nsIBufferInputStream* aIStream, 
+	nsIInputStream* aIStream, 
 	PRUint32 sourceOffset, 
 	PRUint32 aLength)
 #else
@@ -1053,7 +1053,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::GetBindInfo(nsIURI* aURL, nsStreamBind
 #ifdef NECKO
 NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(
 	nsISupports* aContext, 
-	nsIBufferInputStream *aIStream, 
+	nsIInputStream *aIStream, 
 	PRUint32 sourceOffset, 
 	PRUint32 aLength)
 #else
diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
index 853d61b57f2..a3e4ef1ec38 100644
--- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp
@@ -69,7 +69,7 @@ public:
   NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; }
   NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; }
   // nsIStreamListener methods:
-  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
   // nsIStreamListener
   NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
@@ -692,7 +692,7 @@ PluginListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
 
 NS_IMETHODIMP
 #ifdef NECKO
-PluginListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
+PluginListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
 #else
 PluginListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
                                 PRUint32 aCount)
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index 2fc9b40ae21..d001745ca21 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -397,7 +397,7 @@ public:
     NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; }
     NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; }
     // nsIStreamListener methods:
-    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);  
+    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);  
 
 #else
   //nsIStreamObserver interface
@@ -488,7 +488,7 @@ public:
 		const PRUnichar *errorMsg) { return NS_OK; }
 	
 	// nsIStreamListener methods:
-	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, 
+	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, 
 		PRUint32 sourceOffset, PRUint32 count);
 
 #else
@@ -666,7 +666,7 @@ nsPluginCacheListener::OnProgress(nsIURI* aURL, PRUint32 aProgress, PRUint32 aPr
 NS_IMETHODIMP 
 #ifdef NECKO
 nsPluginCacheListener::OnDataAvailable(nsISupports* ctxt, 
-	nsIBufferInputStream* aIStream, 
+	nsIInputStream* aIStream, 
 	PRUint32 sourceOffset, 
 	PRUint32 aLength)
 #else
@@ -1053,7 +1053,7 @@ NS_IMETHODIMP nsPluginStreamListenerPeer::GetBindInfo(nsIURI* aURL, nsStreamBind
 #ifdef NECKO
 NS_IMETHODIMP nsPluginStreamListenerPeer::OnDataAvailable(
 	nsISupports* aContext, 
-	nsIBufferInputStream *aIStream, 
+	nsIInputStream *aIStream, 
 	PRUint32 sourceOffset, 
 	PRUint32 aLength)
 #else
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
index 853d61b57f2..a3e4ef1ec38 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp
@@ -69,7 +69,7 @@ public:
   NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_ERROR_NOT_IMPLEMENTED; }
   NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_ERROR_NOT_IMPLEMENTED; }
   // nsIStreamListener methods:
-  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+  NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
   // nsIStreamListener
   NS_IMETHOD OnStartBinding(nsIURI* aURL, const char *aContentType);
@@ -692,7 +692,7 @@ PluginListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo)
 
 NS_IMETHODIMP
 #ifdef NECKO
-PluginListener::OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
+PluginListener::OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count)
 #else
 PluginListener::OnDataAvailable(nsIURI* aURL, nsIInputStream* aStream,
                                 PRUint32 aCount)
diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp
index 30704a79656..2740b37afb4 100644
--- a/mozilla/parser/htmlparser/src/nsParser.cpp
+++ b/mozilla/parser/htmlparser/src/nsParser.cpp
@@ -1097,7 +1097,7 @@ nsParser::OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *err
  *  @return  error code (usually 0)
  */
 #ifdef NECKO
-nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
+nsresult nsParser::OnDataAvailable(nsISupports* aContext, nsIInputStream *pIStream, PRUint32 sourceOffset, PRUint32 aLength)
 #else
 nsresult nsParser::OnDataAvailable(nsIURI* aURL, nsIInputStream *pIStream, PRUint32 aLength)
 #endif
diff --git a/mozilla/parser/htmlparser/src/nsParser.h b/mozilla/parser/htmlparser/src/nsParser.h
index 685adc2ede7..ea5806c73e1 100644
--- a/mozilla/parser/htmlparser/src/nsParser.h
+++ b/mozilla/parser/htmlparser/src/nsParser.h
@@ -249,7 +249,7 @@ friend class CTokenHandler;
     NS_IMETHOD OnStartRequest(nsISupports *ctxt);
     NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg);
     // nsIStreamListener methods:
-    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
     NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo);
     NS_IMETHOD OnProgress(nsIURI* aURL, PRUint32 Progress, PRUint32 ProgressMax);
diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp
index 145d344c430..b8d222f2c55 100644
--- a/mozilla/uriloader/base/nsDocLoader.cpp
+++ b/mozilla/uriloader/base/nsDocLoader.cpp
@@ -145,7 +145,7 @@ public:
 		const PRUnichar *errorMsg) { return NS_OK; }
 	
 	// nsIStreamListener methods:
-	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, 
+	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, 
 		PRUint32 sourceOffset, PRUint32 count);
 
     // nsIProgressEventSink methods:
@@ -1927,7 +1927,7 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType)
 
 #ifdef NECKO
 NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsISupports *ctxt,
-                                              nsIBufferInputStream *aStream, 
+                                              nsIInputStream *aStream, 
                                               PRUint32 sourceOffset, 
                                               PRUint32 aLength)
 #else
diff --git a/mozilla/webshell/src/nsDocLoader.cpp b/mozilla/webshell/src/nsDocLoader.cpp
index 145d344c430..b8d222f2c55 100644
--- a/mozilla/webshell/src/nsDocLoader.cpp
+++ b/mozilla/webshell/src/nsDocLoader.cpp
@@ -145,7 +145,7 @@ public:
 		const PRUnichar *errorMsg) { return NS_OK; }
 	
 	// nsIStreamListener methods:
-	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, 
+	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, 
 		PRUint32 sourceOffset, PRUint32 count);
 
     // nsIProgressEventSink methods:
@@ -1927,7 +1927,7 @@ nsDocumentBindInfo::OnStartBinding(nsIURI* aURL, const char *aContentType)
 
 #ifdef NECKO
 NS_METHOD nsDocumentBindInfo::OnDataAvailable(nsISupports *ctxt,
-                                              nsIBufferInputStream *aStream, 
+                                              nsIInputStream *aStream, 
                                               PRUint32 sourceOffset, 
                                               PRUint32 aLength)
 #else
diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp
index 18ec033a6f1..81d640c6c7d 100644
--- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp
+++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp
@@ -108,7 +108,7 @@ public:
 							 const PRUnichar *errorMsg) { return NS_OK; }
 
 	// nsIStreamListener
-	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+	NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 
 #else
 	// stream observer
@@ -315,7 +315,7 @@ RelatedLinksStreamListener::GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo
 NS_IMETHODIMP
 #ifdef NECKO
 RelatedLinksStreamListener::OnDataAvailable(nsISupports *ctxt,
-											nsIBufferInputStream *aIStream,
+											nsIInputStream *aIStream,
 											PRUint32 sourceOffset,
 											PRUint32 aLength)
 #else
diff --git a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp
index b2751f17cd7..eb9831c32c8 100644
--- a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp
+++ b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.cpp
@@ -217,7 +217,7 @@ nsDownloadProgressDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) {
 
 NS_IMETHODIMP
 #ifdef NECKO
-nsDownloadProgressDialog::OnDataAvailable(nsISupports* aContext, nsIBufferInputStream *aIStream,
+nsDownloadProgressDialog::OnDataAvailable(nsISupports* aContext, nsIInputStream *aIStream,
                                           PRUint32 offset, PRUint32 aLength)
 #else
 nsDownloadProgressDialog::OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength)
diff --git a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h
index 2e29fea7c57..7c4cdeeaea9 100644
--- a/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h
+++ b/mozilla/xpfe/components/xfer/src/nsDownloadProgressDialog.h
@@ -55,7 +55,7 @@ public:
     NS_IMETHOD OnStartRequest(nsISupports *ctxt) { return NS_OK; } 
     NS_IMETHOD OnStopRequest(nsISupports *ctxt, nsresult status, const PRUnichar *errorMsg) { return NS_OK; } 
     // nsIStreamListener methods:
-    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIBufferInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
+    NS_IMETHOD OnDataAvailable(nsISupports *ctxt, nsIInputStream *inStr, PRUint32 sourceOffset, PRUint32 count);
 #else
     NS_IMETHOD GetBindInfo(nsIURI* aURL, nsStreamBindingInfo* aInfo) { return NS_ERROR_NOT_IMPLEMENTED; }
     NS_IMETHOD OnDataAvailable(nsIURI* aURL, nsIInputStream *aIStream, PRUint32 aLength);
diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp
index d992d1952db..58c66d6a656 100644
--- a/mozilla/xpinstall/src/nsXPInstallManager.cpp
+++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp
@@ -340,7 +340,7 @@ nsXPInstallManager::OnStopBinding(nsIURI* aURL,
 NS_IMETHODIMP
 #ifdef NECKO
 nsXPInstallManager::OnDataAvailable(nsISupports *ctxt, 
-                                    nsIBufferInputStream *pIStream,
+                                    nsIInputStream *pIStream,
                                     PRUint32 sourceOffset, 
                                     PRUint32 length)
 #else
diff --git a/mozilla/xpinstall/src/nsXPInstallManager.h b/mozilla/xpinstall/src/nsXPInstallManager.h
index c59e8dd673d..7642c90deff 100644
--- a/mozilla/xpinstall/src/nsXPInstallManager.h
+++ b/mozilla/xpinstall/src/nsXPInstallManager.h
@@ -72,7 +72,7 @@ class nsXPInstallManager : public nsIXPINotifier, public nsIStreamListener
                                  const PRUnichar *errorMsg) { return NS_OK; }
         // nsIStreamListener
         NS_IMETHOD OnDataAvailable(nsISupports *ctxt, 
-                                   nsIBufferInputStream *inStr,
+                                   nsIInputStream *inStr,
                                    PRUint32 sourceOffset, 
                                    PRUint32 count);
 #else