Backed out changeset b5d33e3a8420 (bug 1389303) for failing chrome test dom/browser-element/mochitest/test_browserElement_inproc_getWebManifest.html on Android. r=backout

This commit is contained in:
Sebastian Hengst 2017-08-17 16:27:22 +02:00
parent a905e04677
commit dad4ec9261

View File

@ -71,7 +71,6 @@ private:
nsCOMPtr<nsIInterfaceRequestor> mCallbacks;
nsCOMPtr<nsILoadGroup> mLoadGroup;
nsCOMPtr<nsILoadInfo> mLoadInfo;
nsCOMPtr<nsIStreamListener> mListener;
};
NS_IMPL_ADDREF(nsExtProtocolChannel)
@ -176,19 +175,11 @@ nsresult nsExtProtocolChannel::OpenURL()
}
rv = extProtService->LoadURI(mUrl, aggCallbacks);
if (NS_SUCCEEDED(rv) && mListener) {
RefPtr<nsExtProtocolChannel> self = this;
MessageLoop::current()->PostTask(
NS_NewRunnableFunction(
"nsExtProtocolChannel::OpenURL",
[self]() {
self->mListener->OnStartRequest(self, nullptr);
self->mListener->OnStopRequest(self, nullptr, self->mStatus);
self->mListener = nullptr;
}));
} else {
mListener = nullptr;
if (NS_SUCCEEDED(rv)) {
// despite success, we need to abort this channel, at the very least
// to make it clear to the caller that no on{Start,Stop}Request
// should be expected.
rv = NS_ERROR_NO_CONTENT;
}
}
@ -227,7 +218,6 @@ NS_IMETHODIMP nsExtProtocolChannel::AsyncOpen(nsIStreamListener *listener, nsISu
NS_ENSURE_TRUE(!mWasOpened, NS_ERROR_ALREADY_OPENED);
mWasOpened = true;
mListener = listener;
return OpenURL();
}