diff -r 000000000000 -r 6474c204b198 xpcom/glue/nsServiceManagerUtils.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xpcom/glue/nsServiceManagerUtils.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,101 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* 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/. */
+
+#ifndef nsServiceManagerUtils_h__
+#define nsServiceManagerUtils_h__
+
+#include "nsIServiceManager.h"
+#include "nsCOMPtr.h"
+
+inline
+const nsGetServiceByCID
+do_GetService(const nsCID& aCID)
+{
+    return nsGetServiceByCID(aCID);
+}
+
+inline
+const nsGetServiceByCIDWithError
+do_GetService(const nsCID& aCID, nsresult* error)
+{
+    return nsGetServiceByCIDWithError(aCID, error);
+}
+
+inline
+const nsGetServiceByContractID
+do_GetService(const char* aContractID)
+{
+    return nsGetServiceByContractID(aContractID);
+}
+
+inline
+const nsGetServiceByContractIDWithError
+do_GetService( const char* aContractID, nsresult* error)
+{
+    return nsGetServiceByContractIDWithError(aContractID, error);
+}
+
+class nsGetServiceFromCategory : public nsCOMPtr_helper
+{
+ public:
+    nsGetServiceFromCategory(const char* aCategory, const char* aEntry,
+                             nsresult* aErrorPtr)
+        : mCategory(aCategory),
+        mEntry(aEntry),
+        mErrorPtr(aErrorPtr)
+        {
+            // nothing else to do
+        }
+    
+    virtual nsresult NS_FASTCALL operator()( const nsIID&, void** ) const;
+ protected:
+    const char*                 mCategory;
+    const char*                 mEntry;
+    nsresult*                   mErrorPtr;
+};
+
+inline
+const nsGetServiceFromCategory
+do_GetServiceFromCategory( const char* category, const char* entry,
+                           nsresult* error = 0)
+{
+    return nsGetServiceFromCategory(category, entry, error);
+}
+
+NS_COM_GLUE nsresult
+CallGetService(const nsCID &aClass, const nsIID &aIID, void **aResult);
+
+NS_COM_GLUE nsresult
+CallGetService(const char *aContractID, const nsIID &aIID, void **aResult);
+
+// type-safe shortcuts for calling |GetService|
+template <class DestinationType>
+inline
+nsresult
+CallGetService( const nsCID &aClass,
+                DestinationType** aDestination)
+{
+    NS_PRECONDITION(aDestination, "null parameter");
+    
+    return CallGetService(aClass,
+                          NS_GET_TEMPLATE_IID(DestinationType),
+                          reinterpret_cast<void**>(aDestination));
+}
+
+template <class DestinationType>
+inline
+nsresult
+CallGetService( const char *aContractID,
+                DestinationType** aDestination)
+{
+    NS_PRECONDITION(aContractID, "null parameter");
+    NS_PRECONDITION(aDestination, "null parameter");
+    
+    return CallGetService(aContractID,
+                          NS_GET_TEMPLATE_IID(DestinationType),
+                          reinterpret_cast<void**>(aDestination));
+}
+
+#endif