Bug 580450 - Clean up IPC::URI. r=dwitte

dom/ipc/ContentChild.cpp

@@ -351,7 +351,7 @@ ContentChild::RecvNotifyRemotePrefObserver(const nsCString& aPref)
 bool
 ContentChild::RecvNotifyVisited(const IPC::URI& aURI)
 {
-    nsCOMPtr<nsIURI> newURI = aURI;
+    nsCOMPtr<nsIURI> newURI(aURI);
     History::GetService()->NotifyVisited(newURI);
     return true;
 }

dom/ipc/ContentParent.cpp

@@ -277,7 +277,7 @@ ContentParent::RecvTestPermission(const IPC::URI&  aUri,
 {
     EnsurePermissionService();
 
-    nsCOMPtr<nsIURI> uri = aUri;
+    nsCOMPtr<nsIURI> uri(aUri);
     if (aExact) {
         mPermissionService->TestExactPermission(uri, aType.get(), retValue);
     } else {
@@ -435,7 +435,7 @@ ContentParent::RequestRunToCompletion()
 bool
 ContentParent::RecvStartVisitedQuery(const IPC::URI& aURI)
 {
-    nsCOMPtr<nsIURI> newURI = aURI;
+    nsCOMPtr<nsIURI> newURI(aURI);
     IHistory *history = nsContentUtils::GetHistory(); 
     history->RegisterVisitedCallback(newURI, nsnull);
     return true;
@@ -447,8 +447,8 @@ ContentParent::RecvVisitURI(const IPC::URI& uri,
                                    const IPC::URI& referrer,
                                    const PRUint32& flags)
 {
-    nsCOMPtr<nsIURI> ourURI = uri;
-    nsCOMPtr<nsIURI> ourReferrer = referrer;
+    nsCOMPtr<nsIURI> ourURI(uri);
+    nsCOMPtr<nsIURI> ourReferrer(referrer);
     IHistory *history = nsContentUtils::GetHistory(); 
     history->VisitURI(ourURI, ourReferrer, flags);
     return true;
@@ -459,7 +459,7 @@ bool
 ContentParent::RecvSetURITitle(const IPC::URI& uri,
                                       const nsString& title)
 {
-    nsCOMPtr<nsIURI> ourURI = uri;
+    nsCOMPtr<nsIURI> ourURI(uri);
     IHistory *history = nsContentUtils::GetHistory(); 
     history->SetURITitle(ourURI, title);
     return true;

extensions/cookie/nsPermissionManager.cpp

@@ -594,7 +594,7 @@ nsPermissionManager::TestExactPermission(nsIURI     *aURI,
 #ifdef MOZ_IPC
   ContentChild* cpc = ChildProcess();
   if (cpc) {
-    return cpc->SendTestPermission(IPC::URI(aURI), nsDependentCString(aType), PR_TRUE,
+    return cpc->SendTestPermission(aURI, nsDependentCString(aType), PR_TRUE,
       aPermission) ? NS_OK : NS_ERROR_FAILURE;
   }
 #endif
@@ -609,7 +609,7 @@ nsPermissionManager::TestPermission(nsIURI     *aURI,
 #ifdef MOZ_IPC
   ContentChild* cpc = ChildProcess();
   if (cpc) {
-    return cpc->SendTestPermission(IPC::URI(aURI), nsDependentCString(aType), PR_FALSE,
+    return cpc->SendTestPermission(aURI, nsDependentCString(aType), PR_FALSE,
       aPermission) ? NS_OK : NS_ERROR_FAILURE;
   }
 #endif

netwerk/cookie/CookieServiceParent.cpp

@@ -70,8 +70,8 @@ CookieServiceParent::RecvGetCookieString(const IPC::URI& aHost,
 
   // Deserialize URIs. Having a host URI is mandatory and should always be
   // provided by the child; thus we consider failure fatal.
-  nsCOMPtr<nsIURI> hostURI = aHost;
-  nsCOMPtr<nsIURI> originatingURI = aOriginating;
+  nsCOMPtr<nsIURI> hostURI(aHost);
+  nsCOMPtr<nsIURI> originatingURI(aOriginating);
   if (!hostURI)
     return false;
 
@@ -92,8 +92,8 @@ CookieServiceParent::RecvSetCookieString(const IPC::URI& aHost,
 
   // Deserialize URIs. Having a host URI is mandatory and should always be
   // provided by the child; thus we consider failure fatal.
-  nsCOMPtr<nsIURI> hostURI = aHost;
-  nsCOMPtr<nsIURI> originatingURI = aOriginating;
+  nsCOMPtr<nsIURI> hostURI(aHost);
+  nsCOMPtr<nsIURI> originatingURI(aOriginating);
   if (!hostURI)
     return false;
 

netwerk/ipc/NeckoMessageUtils.h

@@ -57,15 +57,15 @@ class URI {
  public:
   URI() : mURI(nsnull) {}
   URI(nsIURI* aURI) : mURI(aURI) {}
-  // The contained URI is already addrefed on creation. We don't want another
-  // addref when passing it off to its actual owner.
-  operator nsCOMPtr<nsIURI>() const { return already_AddRefed<nsIURI>(mURI); }
+  operator nsIURI*() const { return mURI.get(); }
 
   friend struct ParamTraits<URI>;
   
  private:
+  // Unimplemented
   URI& operator=(URI&);
-  nsIURI* mURI;
+
+  nsCOMPtr<nsIURI> mURI;
 };
   
 template<>
@@ -136,7 +136,7 @@ struct ParamTraits<URI>
       if (NS_FAILED(rv))
         return false;
       
-      uri.forget(&aResult->mURI);
+      uri.swap(aResult->mURI);
       return true;
     }
     
@@ -153,7 +153,7 @@ struct ParamTraits<URI>
     if (!serializable || !serializable->Read(aMsg, aIter))
       return false;
 
-    uri.forget(&aResult->mURI);
+    uri.swap(aResult->mURI);
     return true;
   }
 

netwerk/protocol/http/HttpChannelParent.cpp

@@ -107,11 +107,11 @@ HttpChannelParent::RecvAsyncOpen(const IPC::URI&            aURI,
                                  const PRBool&              allowPipelining,
                                  const PRBool&              forceAllowThirdPartyCookie)
 {
-  nsCOMPtr<nsIURI> uri = aURI;
-  nsCOMPtr<nsIURI> originalUri = aOriginalURI;
-  nsCOMPtr<nsIURI> docUri = aDocURI;
-  nsCOMPtr<nsIURI> referrerUri = aReferrerURI;
-  
+  nsCOMPtr<nsIURI> uri(aURI);
+  nsCOMPtr<nsIURI> originalUri(aOriginalURI);
+  nsCOMPtr<nsIURI> docUri(aDocURI);
+  nsCOMPtr<nsIURI> referrerUri(aReferrerURI);
+
   nsCString uriSpec;
   uri->GetSpec(uriSpec);
   LOG(("HttpChannelParent RecvAsyncOpen [this=%x uri=%s]\n", 

toolkit/components/places/src/History.cpp

@@ -173,7 +173,7 @@ public:
     mozilla::dom::ContentChild * cpc = 
       mozilla::dom::ContentChild::GetSingleton();
     NS_ASSERTION(cpc, "Content Protocol is NULL!");
-    (void)cpc->SendStartVisitedQuery(IPC::URI(aURI));
+    (void)cpc->SendStartVisitedQuery(aURI);
     return NS_OK;
   }
 #endif
@@ -984,7 +984,7 @@ History::NotifyVisited(nsIURI* aURI)
     mozilla::dom::ContentParent* cpp = 
       mozilla::dom::ContentParent::GetSingleton(PR_FALSE);
     if (cpp)
-      (void)cpp->SendNotifyVisited(IPC::URI(aURI));
+      (void)cpp->SendNotifyVisited(aURI);
   }
 #endif
 
@@ -1089,7 +1089,7 @@ History::VisitURI(nsIURI* aURI,
     mozilla::dom::ContentChild * cpc = 
       mozilla::dom::ContentChild::GetSingleton();
     NS_ASSERTION(cpc, "Content Protocol is NULL!");
-    (void)cpc->SendVisitURI(IPC::URI(aURI), IPC::URI(aLastVisitedURI), aFlags);
+    (void)cpc->SendVisitURI(aURI, aLastVisitedURI, aFlags);
     return NS_OK;
   } 
 #endif /* MOZ_IPC */
@@ -1268,7 +1268,7 @@ History::SetURITitle(nsIURI* aURI, const nsAString& aTitle)
     mozilla::dom::ContentChild * cpc = 
       mozilla::dom::ContentChild::GetSingleton();
     NS_ASSERTION(cpc, "Content Protocol is NULL!");
-    (void)cpc->SendSetURITitle(IPC::URI(aURI), nsDependentString(aTitle));
+    (void)cpc->SendSetURITitle(aURI, nsDependentString(aTitle));
     return NS_OK;
   } 
 #endif /* MOZ_IPC */