diff -r 000000000000 -r 6474c204b198 xpcom/ds/nsAtomService.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xpcom/ds/nsAtomService.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,57 @@
+/* -*- 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 "nsAtomService.h"
+#include "nsIAtom.h"
+
+NS_IMPL_ISUPPORTS(nsAtomService, nsIAtomService)
+
+nsAtomService::nsAtomService()
+{
+}
+
+nsresult
+nsAtomService::GetAtom(const nsAString& aString, nsIAtom ** aResult)
+{
+  *aResult = NS_NewAtom(aString).take();
+
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+  
+  return NS_OK;
+}
+
+nsresult
+nsAtomService::GetPermanentAtom(const nsAString& aString, nsIAtom ** aResult)
+{
+  *aResult = NS_NewPermanentAtom(aString);
+
+  if (!*aResult)
+    return NS_ERROR_OUT_OF_MEMORY;
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsAtomService::GetAtomUTF8(const char *aValue, nsIAtom* *aResult)
+{
+    *aResult = NS_NewAtom(aValue).take();
+
+    if (!*aResult)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsAtomService::GetPermanentAtomUTF8(const char *aValue, nsIAtom* *aResult)
+{
+    *aResult = NS_NewPermanentAtom(NS_ConvertUTF8toUTF16(aValue));
+
+    if (!*aResult)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    return NS_OK;
+}