Backed out changeset 4198b9d273b9 (bug 1399541) for causing bug 1399899.

This commit is contained in:
Ryan VanderMeulen 2017-09-14 12:13:38 -04:00
parent 9b5f5a54bb
commit 749fec75f0

View File

@ -3977,7 +3977,6 @@ nsHttpChannel::OpenCacheEntry(bool isHttps)
mCacheAsyncOpenCalled = true;
if (mNetworkTriggered) {
mRaceCacheWithNetwork = true;
MOZ_RELEASE_ASSERT(sRCWNEnabled, "Racing should be enabled");
}
rv = cacheStorage->AsyncOpenURI(openURI, extension, cacheEntryOpenFlags, this);
} else {
@ -3988,9 +3987,6 @@ nsHttpChannel::OpenCacheEntry(bool isHttps)
self->mCacheAsyncOpenCalled = true;
if (self->mNetworkTriggered) {
self->mRaceCacheWithNetwork = true;
// This is only done in xpcshell-test to simulate a slow
// opening of the cache, so we don't need to assert that
// sRCWNEnabled == true
}
cacheStorage->AsyncOpenURI(openURI, extension, cacheEntryOpenFlags, self);
};
@ -9392,7 +9388,6 @@ nsHttpChannel::TriggerNetwork()
if (mCacheAsyncOpenCalled && !mOnCacheAvailableCalled) {
mRaceCacheWithNetwork = true;
MOZ_RELEASE_ASSERT(sRCWNEnabled, "Racing should be enabled");
}
LOG((" triggering network\n"));