fixing bustage

netwerk/protocol/about/src/nsAboutBlank.cpp

@@ -38,7 +38,7 @@
 #include "nsAboutBlank.h"
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"
-#include "nsIStringStream.h"
+#include "nsStringStream.h"
 #include "nsNetUtil.h"
 
 NS_IMPL_ISUPPORTS1(nsAboutBlank, nsIAboutModule)

netwerk/protocol/about/src/nsAboutBloat.cpp

@@ -38,7 +38,7 @@
 #include "nsAboutBloat.h"
 #include "nsIIOService.h"
 #include "nsIServiceManager.h"
-#include "nsIStringStream.h"
+#include "nsStringStream.h"
 #include "nsXPIDLString.h"
 #include "nsIURI.h"
 #include "prtime.h"

netwerk/protocol/file/src/nsFileChannel.cpp

@@ -226,7 +226,7 @@ nsFileUploadContentStream::ReadSegments(nsWriteSegmentFun fun, void *closure,
   *result = 0;  // nothing is ever actually read from this stream
 
   if (IsClosed())
-    return Status();
+    return NS_OK;
 
   if (IsNonBlocking()) {
     // Inform the caller that they will have to wait for the copy operation to

netwerk/protocol/http/src/nsHttpConnection.cpp

@@ -46,7 +46,7 @@
 #include "nsISocketTransport.h"
 #include "nsIServiceManager.h"
 #include "nsISSLSocketControl.h"
-#include "nsIStringStream.h"
+#include "nsStringStream.h"
 #include "netCore.h"
 #include "nsNetCID.h"
 #include "nsAutoLock.h"

netwerk/protocol/http/src/nsHttpTransaction.cpp

@@ -50,10 +50,10 @@
 #include "pratom.h"
 #include "plevent.h"
 
-#include "nsIStringStream.h"
 #include "nsISeekableStream.h"
 #include "nsISocketTransport.h"
 #include "nsMultiplexInputStream.h"
+#include "nsStringStream.h"
 
 #include "nsComponentManagerUtils.h" // do_CreateInstance