merge backout of bug 580508 / a2246039f70d due to test failure
authorJustin Dolske <dolske@mozilla.com>
Mon, 02 Aug 2010 19:04:09 -0700
changeset 48758 49ff69f7b7f8cac718feadd71ae3d5ddc10b670b
parent 48756 ecc2ca05ae47862e75defcb9a9f41ef614c3d436 (current diff)
parent 48757 be2739ea6a76c4c5df73d91ac5c6cd8bc73fbb94 (diff)
child 48759 2dc8f1355ab6131402faf8843baacb465eac1cdc
push id14801
push userjdolske@mozilla.com
push dateTue, 03 Aug 2010 02:04:50 +0000
treeherdermozilla-central@49ff69f7b7f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs580508
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge backout of bug 580508 / a2246039f70d due to test failure
netwerk/test/unit/test_bug580508.js
--- a/netwerk/protocol/res/nsResProtocolHandler.cpp
+++ b/netwerk/protocol/res/nsResProtocolHandler.cpp
@@ -406,35 +406,17 @@ nsResProtocolHandler::AllowPort(PRInt32 
 NS_IMETHODIMP
 nsResProtocolHandler::SetSubstitution(const nsACString& root, nsIURI *baseURI)
 {
     if (!baseURI) {
         mSubstitutions.Remove(root);
         return NS_OK;
     }
 
-    // If baseURI isn't a resource URI, we can set the substitution immediately.
-    nsCAutoString scheme;
-    nsresult rv = baseURI->GetScheme(scheme);
-    NS_ENSURE_SUCCESS(rv, rv);
-    if (!scheme.Equals(NS_LITERAL_CSTRING("resource"))) {
-        return mSubstitutions.Put(root, baseURI) ? NS_OK : NS_ERROR_UNEXPECTED;
-    }
-
-    // baseURI is a resource URI, let's resolve it first.
-    nsCAutoString newBase;
-    rv = ResolveURI(baseURI, newBase);
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    nsCOMPtr<nsIURI> newBaseURI;
-    rv = mIOService->NewURI(newBase, nsnull, nsnull,
-                            getter_AddRefs(newBaseURI));
-    NS_ENSURE_SUCCESS(rv, rv);
-
-    return mSubstitutions.Put(root, newBaseURI) ? NS_OK : NS_ERROR_UNEXPECTED;
+    return mSubstitutions.Put(root, baseURI) ? NS_OK : NS_ERROR_UNEXPECTED;
 }
 
 NS_IMETHODIMP
 nsResProtocolHandler::GetSubstitution(const nsACString& root, nsIURI **result)
 {
     NS_ENSURE_ARG_POINTER(result);
 
     if (mSubstitutions.Get(root, result))
deleted file mode 100644
--- a/netwerk/test/unit/test_bug580508.js
+++ /dev/null
@@ -1,29 +0,0 @@
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-let ioService = Cc["@mozilla.org/network/io-service;1"]
-                .getService(Ci.nsIIOService);
-let resProt = ioService.getProtocolHandler("resource")
-              .QueryInterface(Ci.nsIResProtocolHandler);
-
-function run_test() {
-    // Define a resource:// alias that points to another resource:// URI.
-    let greModulesURI = ioService.newURI("resource://gre/modules/", null, null);
-    resProt.setSubstitution("my-gre-modules", greModulesURI);
-
-    // When we ask for the alias, we should not get the resource://
-    // URI that we registered it for but the original file URI.
-    let greFileSpec = ioService.newURI("modules/", null,
-                                       resProt.getSubstitution("gre")).spec;
-    let aliasURI = resProt.getSubstitution("my-gre-modules");
-    do_check_eq(aliasURI.spec, greFileSpec);
-
-    // Resolving URIs using the original resource path and the alias
-    // should yield the same result.
-    let greNetUtilURI = ioService.newURI("resource://gre/modules/NetUtil.jsm",
-                                         null, null);
-    let myNetUtilURI = ioService.newURI("resource://my-gre-modules/NetUtil.jsm",
-                                        null, null);
-    do_check_eq(resProt.resolveURI(greNetUtilURI),
-                resProt.resolveURI(myNetUtilURI));
-}