Bug 575639 - [e10s] clean up GetBaseURIFromPackage signature. r=jdm, a=dougt

chrome/src/nsChromeRegistry.cpp

@@ -329,9 +329,7 @@ nsChromeRegistry::ConvertChromeURL(nsIURI* aChromeURI, nsIURI* *aResult)
   rv = GetProviderAndPath(chromeURL, provider, path);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  nsIURI* baseURI;
-  rv = GetBaseURIFromPackage(package, provider, path, &baseURI);
-  NS_ENSURE_SUCCESS(rv, rv);
+  nsIURI* baseURI = GetBaseURIFromPackage(package, provider, path);
 
   PRUint32 flags;
   rv = GetFlagsFromPackage(package, &flags);

chrome/src/nsChromeRegistry.h

@@ -118,10 +118,9 @@ protected:
   static void LogMessageWithContext(nsIURI* aURL, PRUint32 aLineNumber, PRUint32 flags,
                                     const char* aMsg, ...);
 
-  virtual nsresult GetBaseURIFromPackage(const nsCString& aPackage,
-                                         const nsCString& aProvider,
-                                         const nsCString& aPath,
-                                         nsIURI* *aResult) = 0;
+  virtual nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
+                                        const nsCString& aProvider,
+                                        const nsCString& aPath) = 0;
   virtual nsresult GetFlagsFromPackage(const nsCString& aPackage,
                                        PRUint32* aFlags) = 0;
 

chrome/src/nsChromeRegistryChrome.cpp

@@ -532,11 +532,10 @@ CanLoadResource(nsIURI* aResourceURI)
   return isLocalResource;
 }
 
-nsresult
+nsIURI*
 nsChromeRegistryChrome::GetBaseURIFromPackage(const nsCString& aPackage,
                                               const nsCString& aProvider,
-                                              const nsCString& aPath,
-                                              nsIURI* *aResult)
+                                              const nsCString& aPath)
 {
   PackageEntry* entry =
       static_cast<PackageEntry*>(PL_DHashTableOperate(&mPackagesHash,
@@ -545,25 +544,24 @@ nsChromeRegistryChrome::GetBaseURIFromPackage(const nsCString& aPackage,
 
   if (PL_DHASH_ENTRY_IS_FREE(entry)) {
     if (!mInitialized)
-      return NS_ERROR_NOT_INITIALIZED;
+      return nsnull;
 
     LogMessage("No chrome package registered for chrome://%s/%s/%s",
                aPackage.get(), aProvider.get(), aPath.get());
 
-    return NS_ERROR_FAILURE;
+    return nsnull;
   }
 
-  *aResult = nsnull;
   if (aProvider.EqualsLiteral("locale")) {
-    *aResult = entry->locales.GetBase(mSelectedLocale, nsProviderArray::LOCALE);
+    return entry->locales.GetBase(mSelectedLocale, nsProviderArray::LOCALE);
   }
   else if (aProvider.EqualsLiteral("skin")) {
-    *aResult = entry->skins.GetBase(mSelectedSkin, nsProviderArray::ANY);
+    return entry->skins.GetBase(mSelectedSkin, nsProviderArray::ANY);
   }
   else if (aProvider.EqualsLiteral("content")) {
-    *aResult = entry->baseURI;
+    return entry->baseURI;
   }
-  return NS_OK;
+  return nsnull;
 }
 
 nsresult

chrome/src/nsChromeRegistryChrome.h

@@ -87,10 +87,9 @@ class nsChromeRegistryChrome : public nsChromeRegistry
 #endif
 
   nsresult SelectLocaleFromPref(nsIPrefBranch* prefs);
-  NS_OVERRIDE nsresult GetBaseURIFromPackage(const nsCString& aPackage,
+  NS_OVERRIDE nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
                                              const nsCString& aProvider,
-                                             const nsCString& aPath,
-                                             nsIURI* *aResult);
+                                             const nsCString& aPath);
   NS_OVERRIDE nsresult GetFlagsFromPackage(const nsCString& aPackage,
                                            PRUint32* aFlags);
 

chrome/src/nsChromeRegistryContent.cpp

@@ -170,28 +170,26 @@ nsChromeRegistryContent::RegisterOverride(const OverrideMapping& aOverride)
   mOverrideTable.Put(chromeURI, overrideURI);
 }
 
-nsresult
+nsIURI*
 nsChromeRegistryContent::GetBaseURIFromPackage(const nsCString& aPackage,
                                                const nsCString& aProvider,
-                                               const nsCString& aPath,
-                                               nsIURI* *aResult)
+                                               const nsCString& aPath)
 {
   PackageEntry* entry;
   if (!mPackagesHash.Get(aPackage, &entry)) {
-    return NS_ERROR_FAILURE;
+    return nsnull;
   }
 
-  *aResult = nsnull;
   if (aProvider.EqualsLiteral("locale")) {
-    *aResult = entry->localeBaseURI;
+    return entry->localeBaseURI;
   }
   else if (aProvider.EqualsLiteral("skin")) {
-    *aResult = entry->skinBaseURI;
+    return entry->skinBaseURI;
   }
   else if (aProvider.EqualsLiteral("content")) {
-    *aResult = entry->contentBaseURI;
+    return entry->contentBaseURI;
   }
-  return NS_OK;
+  return nsnull;
 }
 
 nsresult

chrome/src/nsChromeRegistryContent.h

@@ -88,10 +88,9 @@ class nsChromeRegistryContent : public nsChromeRegistry
   void RegisterResource(const ResourceMapping& aResource);
   void RegisterOverride(const OverrideMapping& aOverride);
 
-  NS_OVERRIDE nsresult GetBaseURIFromPackage(const nsCString& aPackage,
+  NS_OVERRIDE nsIURI* GetBaseURIFromPackage(const nsCString& aPackage,
                                  const nsCString& aProvider,
-                                 const nsCString& aPath,
-                                 nsIURI* *aResult);
+                                 const nsCString& aPath);
   NS_OVERRIDE nsresult GetFlagsFromPackage(const nsCString& aPackage, PRUint32* aFlags);
 
   nsClassHashtable<nsCStringHashKey, PackageEntry> mPackagesHash;