Bug 1623039 Replace URIParams with nsIURI in PWebSocket.ipdl r=valentin

Differential Revision: https://phabricator.services.mozilla.com/D68016

--HG--
extra : moz-landing-system : lando

Author: anjali1903

netwerk/protocol/websocket/PWebSocket.ipdl

@@ -9,14 +9,14 @@ include protocol PNecko;
 include protocol PBrowser;
 include protocol PTransportProvider;
 include IPCStream;
-include URIParams;
 include NeckoChannelParams;
 
 include protocol PFileDescriptorSet; //FIXME: bug #792908
 include protocol PChildToParentStream; //FIXME: bug #792908
 include protocol PParentToChildStream; //FIXME: bug #792908
 
 using class IPC::SerializedLoadContext from "SerializedLoadContext.h";
+using refcounted class nsIURI from "mozilla/ipc/URIUtils.h";
 
 namespace mozilla {
 namespace net {
@@ -27,7 +27,7 @@ async protocol PWebSocket
 
 parent:
   // Forwarded methods corresponding to methods on nsIWebSocketChannel
-  async AsyncOpen(URIParams? aURI,
+  async AsyncOpen(nsIURI aURI,
                   nsCString aOrigin,
                   uint64_t aInnerWindowID,
                   nsCString aProtocol,

netwerk/protocol/websocket/WebSocketChannelChild.cpp

@@ -455,13 +455,12 @@ WebSocketChannelChild::AsyncOpen(nsIURI* aURI, const nsACString& aOrigin,
   // Corresponding release in DeallocPWebSocket
   AddIPDLReference();
 
-  Maybe<URIParams> uri;
+  nsCOMPtr<nsIURI> uri;
   Maybe<LoadInfoArgs> loadInfoArgs;
   Maybe<PTransportProviderChild*> transportProvider;
 
   if (!mIsServerSide) {
-    uri.emplace(URIParams());
-    SerializeURI(aURI, uri.ref());
+    uri = aURI;
     nsresult rv = LoadInfoToLoadInfoArgs(mLoadInfo, &loadInfoArgs);
     NS_ENSURE_SUCCESS(rv, rv);
 

netwerk/protocol/websocket/WebSocketChannelParent.cpp

@@ -47,18 +47,18 @@ mozilla::ipc::IPCResult WebSocketChannelParent::RecvDeleteSelf() {
 }
 
 mozilla::ipc::IPCResult WebSocketChannelParent::RecvAsyncOpen(
-    const Maybe<URIParams>& aURI, const nsCString& aOrigin,
-    const uint64_t& aInnerWindowID, const nsCString& aProtocol,
-    const bool& aSecure, const uint32_t& aPingInterval,
-    const bool& aClientSetPingInterval, const uint32_t& aPingTimeout,
-    const bool& aClientSetPingTimeout, const Maybe<LoadInfoArgs>& aLoadInfoArgs,
+    nsIURI* aURI, const nsCString& aOrigin, const uint64_t& aInnerWindowID,
+    const nsCString& aProtocol, const bool& aSecure,
+    const uint32_t& aPingInterval, const bool& aClientSetPingInterval,
+    const uint32_t& aPingTimeout, const bool& aClientSetPingTimeout,
+    const Maybe<LoadInfoArgs>& aLoadInfoArgs,
     const Maybe<PTransportProviderParent*>& aTransportProvider,
     const nsCString& aNegotiatedExtensions) {
   LOG(("WebSocketChannelParent::RecvAsyncOpen() %p\n", this));
 
   nsresult rv;
-  nsCOMPtr<nsIURI> uri;
   nsCOMPtr<nsILoadInfo> loadInfo;
+  nsCOMPtr<nsIURI> uri;
 
   rv = LoadInfoArgsToLoadInfo(aLoadInfoArgs, getter_AddRefs(loadInfo));
   if (NS_FAILED(rv)) {
@@ -98,7 +98,7 @@ mozilla::ipc::IPCResult WebSocketChannelParent::RecvAsyncOpen(
       goto fail;
     }
   } else {
-    uri = DeserializeURI(aURI);
+    uri = aURI;
     if (!uri) {
       rv = NS_ERROR_FAILURE;
       goto fail;

netwerk/protocol/websocket/WebSocketChannelParent.h

@@ -39,11 +39,10 @@ class WebSocketChannelParent : public PWebSocketParent,
 
  private:
   mozilla::ipc::IPCResult RecvAsyncOpen(
-      const Maybe<URIParams>& aURI, const nsCString& aOrigin,
-      const uint64_t& aInnerWindowID, const nsCString& aProtocol,
-      const bool& aSecure, const uint32_t& aPingInterval,
-      const bool& aClientSetPingInterval, const uint32_t& aPingTimeout,
-      const bool& aClientSetPingTimeout,
+      nsIURI* aURI, const nsCString& aOrigin, const uint64_t& aInnerWindowID,
+      const nsCString& aProtocol, const bool& aSecure,
+      const uint32_t& aPingInterval, const bool& aClientSetPingInterval,
+      const uint32_t& aPingTimeout, const bool& aClientSetPingTimeout,
       const Maybe<LoadInfoArgs>& aLoadInfoArgs,
       const Maybe<PTransportProviderParent*>& aTransportProvider,
       const nsCString& aNegotiatedExtensions);