Bug 1536744 - Add "moz-icon" to NS_NewURIOnAnyThread r=baku

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

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

image/decoders/icon/moz.build

@@ -17,6 +17,10 @@ FINAL_LIBRARY = 'xul'
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
+EXPORTS += [
+  'nsIconURI.h',
+]
+
 platform = None
 
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:

netwerk/base/nsNetUtil.cpp

@@ -99,6 +99,7 @@
 #include "nsSocketTransportService2.h"
 #include "nsViewSourceHandler.h"
 #include "nsJARURI.h"
+#include "nsIconURI.h"
 #include "nsAboutProtocolHandler.h"
 #include "nsResProtocolHandler.h"
 #include "mozilla/net/ExtensionProtocolHandler.h"
@@ -1832,6 +1833,12 @@ nsresult NS_NewURIOnAnyThread(nsIURI** aURI, const nsACString& aSpec,
         .Finalize(aURI);
   }
 
+  if (scheme.EqualsLiteral("moz-icon")) {
+    return NS_MutateURI(new nsMozIconURI::Mutator())
+        .SetSpec(aSpec)
+        .Finalize(aURI);
+  }
+
 #ifdef MOZ_WIDGET_GTK
   if (scheme.EqualsLiteral("smb") || scheme.EqualsLiteral("sftp")) {
     nsCOMPtr<nsIURI> base(aBaseURI);