From ec2f7f5183ed8eecb4f77af4a24c494edab979f9 Mon Sep 17 00:00:00 2001 From: Christoph Kerschbaumer Date: Tue, 28 Jun 2016 15:32:20 +0200 Subject: [PATCH] Bug 1282750 - Convert AboutCache to use AsyncOpen2() r=honza --- netwerk/protocol/about/nsAboutCache.cpp | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/netwerk/protocol/about/nsAboutCache.cpp b/netwerk/protocol/about/nsAboutCache.cpp index 8971c7323322..01648c6ae64a 100644 --- a/netwerk/protocol/about/nsAboutCache.cpp +++ b/netwerk/protocol/about/nsAboutCache.cpp @@ -146,7 +146,8 @@ NS_IMETHODIMP nsAboutCache::Channel::AsyncOpen(nsIStreamListener *aListener, nsI rv = VisitNextStorage(); if (NS_FAILED(rv)) return rv; - rv = mChannel->AsyncOpen(aListener, aContext); + MOZ_ASSERT(!aContext, "asyncOpen2() does not take a context argument"); + rv = mChannel->AsyncOpen2(aListener); if (NS_FAILED(rv)) return rv; return NS_OK; @@ -159,25 +160,12 @@ NS_IMETHODIMP nsAboutCache::Channel::AsyncOpen2(nsIStreamListener *aListener) 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