Backed out 2 changesets (bug 1563313) for failures in test_protocolproxyservice.js CLOSED TREE

Backed out changeset 0585bc6ff55b (bug 1563313)
Backed out changeset 3b9ef89d8c5c (bug 1563313)

netwerk/base/nsProtocolProxyService.cpp

@@ -533,6 +533,7 @@ nsAsyncResolveRequest::AsyncApplyFilters::OnProxyFilterResult(
   }
 
   mFilterCalledBack = true;
+  mProxyInfo = aProxyInfo;
 
   if (mProcessingInLoop) {
     // No need to call/dispatch ProcessNextFilter(), we are in a control
@@ -547,8 +548,6 @@ nsAsyncResolveRequest::AsyncApplyFilters::OnProxyFilterResult(
     return NS_OK;
   }
 
-  mProxyInfo = aProxyInfo;
-
   if (mNextFilterIndex == mFiltersCopy.Length()) {
     // We are done, all filters have been called on!
     Finish();

netwerk/protocol/http/HttpBaseChannel.cpp

@@ -1500,6 +1500,8 @@ HttpBaseChannel::IsThirdPartyTrackingResource(bool* aIsTrackingResource) {
 
 NS_IMETHODIMP
 HttpBaseChannel::GetClassificationFlags(uint32_t* aFlags) {
+  MOZ_ASSERT(!mFirstPartyClassificationFlags ||
+             !mThirdPartyClassificationFlags);
   if (mThirdPartyClassificationFlags) {
     *aFlags = mThirdPartyClassificationFlags;
   } else {
@@ -1510,12 +1512,16 @@ HttpBaseChannel::GetClassificationFlags(uint32_t* aFlags) {
 
 NS_IMETHODIMP
 HttpBaseChannel::GetFirstPartyClassificationFlags(uint32_t* aFlags) {
+  MOZ_ASSERT(
+      !(mFirstPartyClassificationFlags && mFirstPartyClassificationFlags));
   *aFlags = mFirstPartyClassificationFlags;
   return NS_OK;
 }
 
 NS_IMETHODIMP
 HttpBaseChannel::GetThirdPartyClassificationFlags(uint32_t* aFlags) {
+  MOZ_ASSERT(
+      !(mFirstPartyClassificationFlags && mThirdPartyClassificationFlags));
   *aFlags = mThirdPartyClassificationFlags;
   return NS_OK;
 }