Bug 1396307 - Make sure we only set mRaceCacheWithNetwork to true when the feature is enabled r=michal

MozReview-Commit-ID: FrLjfuExmYV

--HG--
extra : rebase_source : 21ec1409444b202fcb73aee8b8d04475c5179679

netwerk/protocol/http/nsHttpChannel.cpp

@@ -3976,7 +3976,7 @@ nsHttpChannel::OpenCacheEntry(bool isHttps)
             MOZ_ASSERT(NS_IsMainThread(), "Should be called on the main thread");
             mCacheAsyncOpenCalled = true;
             if (mNetworkTriggered) {
-                mRaceCacheWithNetwork = true;
+                mRaceCacheWithNetwork = sRCWNEnabled;
             }
             rv = cacheStorage->AsyncOpenURI(openURI, extension, cacheEntryOpenFlags, this);
         } else {
@@ -9387,7 +9387,7 @@ nsHttpChannel::TriggerNetwork()
     }
 
     if (mCacheAsyncOpenCalled && !mOnCacheAvailableCalled) {
-        mRaceCacheWithNetwork = true;
+        mRaceCacheWithNetwork = sRCWNEnabled;
     }
 
     LOG(("  triggering network\n"));