diff -r 000000000000 -r 6474c204b198 mobile/android/base/util/ActivityResultHandlerMap.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mobile/android/base/util/ActivityResultHandlerMap.java	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,24 @@
+/* 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/. */
+
+package org.mozilla.gecko.util;
+
+import android.util.SparseArray;
+
+public final class ActivityResultHandlerMap {
+    private SparseArray<ActivityResultHandler> mMap = new SparseArray<ActivityResultHandler>();
+    private int mCounter = 0;
+
+    public synchronized int put(ActivityResultHandler handler) {
+        mMap.put(mCounter, handler);
+        return mCounter++;
+    }
+
+    public synchronized ActivityResultHandler getAndRemove(int i) {
+        ActivityResultHandler handler = mMap.get(i);
+        mMap.delete(i);
+
+        return handler;
+    }
+}