Bug 1307467 - Remove mAppURI from nsJARChannel r=bagder

MozReview-Commit-ID: CX9TMxY1qZM

--HG--
extra : rebase_source : 2fdb8ddcc0d1f47d28221c9ba7210a67e16bcdb1

modules/libjar/nsIJARChannel.idl

@@ -19,11 +19,6 @@ interface nsIJARChannel : nsIChannel
      */
     [infallible] readonly attribute boolean isUnsafe;
 
-    /**
-     * Forces the uri to be a app:// uri.
-     */
-    void setAppURI(in nsIURI uri);
-
     /**
      * Returns the JAR file.  May be null if the jar is remote.
      */

modules/libjar/nsJARChannel.cpp

@@ -193,7 +193,6 @@ nsJARInputThunk::IsNonBlocking(bool *nonBlocking)
 
 nsJARChannel::nsJARChannel()
     : mOpened(false)
-    , mAppURI(nullptr)
     , mContentDisposition(0)
     , mContentLength(-1)
     , mLoadFlags(LOAD_NORMAL)
@@ -523,11 +522,7 @@ nsJARChannel::SetOriginalURI(nsIURI *aURI)
 NS_IMETHODIMP
 nsJARChannel::GetURI(nsIURI **aURI)
 {
-    if (mAppURI) {
-        NS_IF_ADDREF(*aURI = mAppURI);
-    } else {
-        NS_IF_ADDREF(*aURI = mJarURI);
-    }
+    NS_IF_ADDREF(*aURI = mJarURI);
 
     return NS_OK;
 }
@@ -863,20 +858,6 @@ nsJARChannel::GetIsUnsafe(bool *isUnsafe)
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsJARChannel::SetAppURI(nsIURI *aURI) {
-    NS_ENSURE_ARG_POINTER(aURI);
-
-    nsAutoCString scheme;
-    aURI->GetScheme(scheme);
-    if (!scheme.EqualsLiteral("app")) {
-        return NS_ERROR_INVALID_ARG;
-    }
-
-    mAppURI = aURI;
-    return NS_OK;
-}
-
 NS_IMETHODIMP
 nsJARChannel::GetJarFile(nsIFile **aFile)
 {

modules/libjar/nsJARChannel.h

@@ -72,7 +72,6 @@ private:
 
     nsCOMPtr<nsIJARURI>             mJarURI;
     nsCOMPtr<nsIURI>                mOriginalURI;
-    nsCOMPtr<nsIURI>                mAppURI;
     nsCOMPtr<nsISupports>           mOwner;
     nsCOMPtr<nsILoadInfo>           mLoadInfo;
     nsCOMPtr<nsIInterfaceRequestor> mCallbacks;