Bug 1182571: Fix nsILoadInfo->GetContentPolicyType API to be less ambigious. Audit and fix all users of it. r=ckerschb

2015-10-19 11:14:54 -07:00
parent f4276d39ab
commit bb0dc3507b
16 changed files with 66 additions and 59 deletions
--- a/netwerk/protocol/websocket/WebSocketChannel.cpp
+++ b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -3244,6 +3244,8 @@ WebSocketChannel::AsyncOpen(nsIURI *aURI,
    return rv;
  }

+  // Ideally we'd call newChannelFromURIWithLoadInfo here, but that doesn't
+  // allow setting proxy uri/flags
  rv = io2->NewChannelFromURIWithProxyFlags2(
              localURI,
              mURI,
@@ -3254,7 +3256,7 @@ WebSocketChannel::AsyncOpen(nsIURI *aURI,
              mLoadInfo->LoadingPrincipal(),
              mLoadInfo->TriggeringPrincipal(),
              mLoadInfo->GetSecurityFlags(),
-              mLoadInfo->GetContentPolicyType(),
+              mLoadInfo->InternalContentPolicyType(),
              getter_AddRefs(localChannel));
  NS_ENSURE_SUCCESS(rv, rv);