diff -r 000000000000 -r 6474c204b198 image/decoders/icon/nsIconModule.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/image/decoders/icon/nsIconModule.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/ModuleUtils.h"
+#include "nsServiceManagerUtils.h"
+
+#include "nsIconProtocolHandler.h"
+#include "nsIconURI.h"
+#include "nsIconChannel.h"
+
+// objects that just require generic constructors
+/******************************************************************************
+ * Protocol CIDs
+ */
+#define NS_ICONPROTOCOL_CID   { 0xd0f9db12, 0x249c, 0x11d5, { 0x99, 0x5, 0x0, 0x10, 0x83, 0x1, 0xe, 0x9b } } 
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler)
+
+NS_DEFINE_NAMED_CID(NS_ICONPROTOCOL_CID);
+
+static const mozilla::Module::CIDEntry kIconCIDs[] = {
+  { &kNS_ICONPROTOCOL_CID, false, nullptr, nsIconProtocolHandlerConstructor },
+  { nullptr }
+};
+
+static const mozilla::Module::ContractIDEntry kIconContracts[] = {
+  { NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "moz-icon", &kNS_ICONPROTOCOL_CID },
+  { nullptr }
+};
+
+static const mozilla::Module::CategoryEntry kIconCategories[] = {
+  { nullptr }
+};
+
+static void
+IconDecoderModuleDtor()
+{
+#if (MOZ_WIDGET_GTK == 2)
+  nsIconChannel::Shutdown();
+#endif
+}
+
+static const mozilla::Module kIconModule = {
+  mozilla::Module::kVersion,
+  kIconCIDs,
+  kIconContracts,
+  kIconCategories,
+  nullptr,
+  nullptr,
+  IconDecoderModuleDtor
+};
+
+NSMODULE_DEFN(nsIconDecoderModule) = &kIconModule;