Bug 1282750 - Convert AboutCache to use AsyncOpen2() r=honza
--- a/netwerk/protocol/about/nsAboutCache.cpp
+++ b/netwerk/protocol/about/nsAboutCache.cpp
@@ -141,48 +141,36 @@ NS_IMETHODIMP nsAboutCache::Channel::Asy
if (!mChannel) {
return NS_ERROR_UNEXPECTED;
}
// Kick the walk loop.
rv = VisitNextStorage();
if (NS_FAILED(rv)) return rv;
- rv = mChannel->AsyncOpen(aListener, aContext);
+ MOZ_ASSERT(!aContext, "asyncOpen2() does not take a context argument");
+ rv = NS_MaybeOpenChannelUsingAsyncOpen2(mChannel, aListener);
if (NS_FAILED(rv)) return rv;
return NS_OK;
}
NS_IMETHODIMP nsAboutCache::Channel::AsyncOpen2(nsIStreamListener *aListener)
{
return AsyncOpen(aListener, nullptr);
}
NS_IMETHODIMP nsAboutCache::Channel::Open(nsIInputStream * *_retval)
{
- nsresult rv;
-
- if (!mChannel) {
- return NS_ERROR_UNEXPECTED;
- }
-
- // Kick the walk loop.
- rv = VisitNextStorage();
- if (NS_FAILED(rv)) return rv;
-
- rv = mChannel->Open(_retval);
- if (NS_FAILED(rv)) return rv;
-
- return NS_OK;
+ return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP nsAboutCache::Channel::Open2(nsIInputStream * *_retval)
{
- return Open(_retval);
+ return NS_ERROR_NOT_IMPLEMENTED;
}
nsresult
nsAboutCache::Channel::ParseURI(nsIURI * uri, nsACString & storage)
{
//
// about:cache[?storage=<storage-name>[&context=<context-key>]]
//