diff -r 000000000000 -r 6474c204b198 dom/icc/src/IccManager.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dom/icc/src/IccManager.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,123 @@
+/* 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 "IccManager.h"
+#include "mozilla/dom/MozIccManagerBinding.h"
+#include "GeneratedEvents.h"
+#include "Icc.h"
+#include "IccListener.h"
+#include "mozilla/dom/IccChangeEvent.h"
+#include "mozilla/Preferences.h"
+#include "nsIDOMIccInfo.h"
+
+using namespace mozilla::dom;
+
+NS_IMPL_CYCLE_COLLECTION_CLASS(IccManager)
+
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(IccManager,
+                                                  DOMEventTargetHelper)
+NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
+
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(IccManager,
+                                                DOMEventTargetHelper)
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END
+
+// QueryInterface implementation for IccManager
+NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(IccManager)
+NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper)
+
+NS_IMPL_ADDREF_INHERITED(IccManager, DOMEventTargetHelper)
+NS_IMPL_RELEASE_INHERITED(IccManager, DOMEventTargetHelper)
+
+IccManager::IccManager(nsPIDOMWindow* aWindow)
+  : DOMEventTargetHelper(aWindow)
+{
+  uint32_t numberOfServices =
+    mozilla::Preferences::GetUint("ril.numRadioInterfaces", 1);
+
+  for (uint32_t i = 0; i < numberOfServices; i++) {
+    nsRefPtr<IccListener> iccListener = new IccListener(this, i);
+    mIccListeners.AppendElement(iccListener);
+  }
+}
+
+IccManager::~IccManager()
+{
+  Shutdown();
+}
+
+JSObject*
+IccManager::WrapObject(JSContext* aCx)
+{
+  return MozIccManagerBinding::Wrap(aCx, this);
+}
+
+void
+IccManager::Shutdown()
+{
+  for (uint32_t i = 0; i < mIccListeners.Length(); i++) {
+    mIccListeners[i]->Shutdown();
+    mIccListeners[i] = nullptr;
+  }
+  mIccListeners.Clear();
+}
+
+nsresult
+IccManager::NotifyIccAdd(const nsAString& aIccId)
+{
+  MozIccManagerBinding::ClearCachedIccIdsValue(this);
+
+  IccChangeEventInit init;
+  init.mBubbles = false;
+  init.mCancelable = false;
+  init.mIccId = aIccId;
+
+  nsRefPtr<IccChangeEvent> event =
+    IccChangeEvent::Constructor(this, NS_LITERAL_STRING("iccdetected"), init);
+
+  return DispatchTrustedEvent(event);
+}
+
+nsresult
+IccManager::NotifyIccRemove(const nsAString& aIccId)
+{
+  MozIccManagerBinding::ClearCachedIccIdsValue(this);
+
+  IccChangeEventInit init;
+  init.mBubbles = false;
+  init.mCancelable = false;
+  init.mIccId = aIccId;
+
+  nsRefPtr<IccChangeEvent> event =
+    IccChangeEvent::Constructor(this, NS_LITERAL_STRING("iccundetected"), init);
+
+  return DispatchTrustedEvent(event);
+}
+
+// MozIccManager
+
+void
+IccManager::GetIccIds(nsTArray<nsString>& aIccIds)
+{
+  nsTArray<nsRefPtr<IccListener>>::size_type i;
+  for (i = 0; i < mIccListeners.Length(); ++i) {
+    nsRefPtr<Icc> icc = mIccListeners[i]->GetIcc();
+    if (icc) {
+      aIccIds.AppendElement(icc->GetIccId());
+    }
+  }
+}
+
+already_AddRefed<nsISupports>
+IccManager::GetIccById(const nsAString& aIccId) const
+{
+  nsTArray<nsRefPtr<IccListener>>::size_type i;
+  for (i = 0; i < mIccListeners.Length(); ++i) {
+    nsRefPtr<Icc> icc = mIccListeners[i]->GetIcc();
+    if (icc && aIccId == icc->GetIccId()) {
+      return icc.forget();
+    }
+  }
+  return nullptr;
+}