--- a/b2g/app/b2g.js
+++ b/b2g/app/b2g.js
@@ -195,17 +195,16 @@ pref("privacy.item.downloads", true);
 pref("privacy.item.passwords", true);
 pref("privacy.item.sessions", true);
 pref("privacy.item.geolocation", true);
 pref("privacy.item.siteSettings", true);
 pref("privacy.item.syncAccount", true);
 
 // base url for the wifi geolocation network provider
 pref("geo.provider.use_mls", false);
-pref("geo.cell.scan", true);
 pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
 
 // base url for the stumbler
 pref("geo.stumbler.url", "https://location.services.mozilla.com/v1/geosubmit?key=%MOZILLA_API_KEY%");
 
 // enable geo
 pref("geo.enabled", true);
 

--- a/b2g/chrome/content/shell.js
+++ b/b2g/chrome/content/shell.js
@@ -1,17 +1,16 @@
 /* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- /
 /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
 /* 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/. */
 
 window.performance.mark('gecko-shell-loadstart');
 
-Cu.import('resource://gre/modules/ContactService.jsm');
 Cu.import('resource://gre/modules/NotificationDB.jsm');
 Cu.import("resource://gre/modules/AppsUtils.jsm");
 Cu.import('resource://gre/modules/UserAgentOverrides.jsm');
 Cu.import('resource://gre/modules/Keyboard.jsm');
 Cu.import('resource://gre/modules/ErrorPage.jsm');
 Cu.import('resource://gre/modules/AlertsHelper.jsm');
 Cu.import('resource://gre/modules/SystemUpdateService.jsm');
 

--- a/b2g/installer/package-manifest.in
+++ b/b2g/installer/package-manifest.in
@@ -152,21 +152,17 @@
 @RESPATH@/components/dom_audiochannel.xpt
 @RESPATH@/components/dom_base.xpt
 @RESPATH@/components/dom_system.xpt
 @RESPATH@/components/dom_workers.xpt
 #ifdef MOZ_WIDGET_GONK
 @RESPATH@/components/dom_wifi.xpt
 @RESPATH@/components/dom_system_gonk.xpt
 #endif
-#ifdef MOZ_B2G_RIL
-@RESPATH@/components/dom_mobileconnection.xpt
-#endif
 @RESPATH@/components/dom_canvas.xpt
-@RESPATH@/components/dom_contacts.xpt
 @RESPATH@/components/dom_core.xpt
 @RESPATH@/components/dom_css.xpt
 @RESPATH@/components/dom_events.xpt
 @RESPATH@/components/dom_geolocation.xpt
 @RESPATH@/components/dom_media.xpt
 @RESPATH@/components/dom_network.xpt
 #ifdef MOZ_SECUREELEMENT
 @RESPATH@/components/dom_secureelement.xpt
@@ -332,18 +328,16 @@
 
 ; JavaScript components
 @RESPATH@/components/ConsoleAPI.manifest
 @RESPATH@/components/ConsoleAPIStorage.js
 @RESPATH@/components/BrowserElementParent.manifest
 @RESPATH@/components/BrowserElementParent.js
 @RESPATH@/components/BrowserElementProxy.manifest
 @RESPATH@/components/BrowserElementProxy.js
-@RESPATH@/components/ContactManager.js
-@RESPATH@/components/ContactManager.manifest
 @RESPATH@/components/PhoneNumberService.js
 @RESPATH@/components/PhoneNumberService.manifest
 @RESPATH@/components/NotificationStorage.js
 @RESPATH@/components/NotificationStorage.manifest
 @RESPATH@/components/PermissionSettings.js
 @RESPATH@/components/PermissionSettings.manifest
 @RESPATH@/components/PermissionPromptService.js
 @RESPATH@/components/PermissionPromptService.manifest
@@ -445,18 +439,16 @@
 @RESPATH@/components/IccService.manifest
 @RESPATH@/components/MmsService.js
 @RESPATH@/components/MmsService.manifest
 @RESPATH@/components/MobileMessageDatabaseService.js
 @RESPATH@/components/MobileMessageDatabaseService.manifest
 #ifndef DISABLE_MOZ_RIL_GEOLOC
 @RESPATH@/components/DataCallInterfaceService.js
 @RESPATH@/components/DataCallInterfaceService.manifest
-@RESPATH@/components/MobileConnectionService.js
-@RESPATH@/components/MobileConnectionService.manifest
 @RESPATH@/components/RadioInterfaceLayer.js
 @RESPATH@/components/RadioInterfaceLayer.manifest
 @RESPATH@/components/SmsService.js
 @RESPATH@/components/SmsService.manifest
 #endif
 @RESPATH@/components/StkCmdFactory.js
 @RESPATH@/components/StkCmdFactory.manifest
 @RESPATH@/components/RILSystemMessengerHelper.js

--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -188,17 +188,16 @@
 @RESPATH@/components/dom_core.xpt
 @RESPATH@/components/dom_css.xpt
 @RESPATH@/components/dom_events.xpt
 @RESPATH@/components/dom_geolocation.xpt
 @RESPATH@/components/dom_media.xpt
 @RESPATH@/components/dom_network.xpt
 @RESPATH@/components/dom_notification.xpt
 @RESPATH@/components/dom_html.xpt
-@RESPATH@/components/dom_icc.xpt
 @RESPATH@/components/dom_offline.xpt
 @RESPATH@/components/dom_json.xpt
 @RESPATH@/components/dom_power.xpt
 @RESPATH@/components/dom_push.xpt
 @RESPATH@/components/dom_quota.xpt
 @RESPATH@/components/dom_range.xpt
 @RESPATH@/components/dom_security.xpt
 @RESPATH@/components/dom_settings.xpt
@@ -504,18 +503,16 @@
 @RESPATH@/components/AppsService.manifest
 @RESPATH@/components/recording-cmdline.js
 @RESPATH@/components/recording-cmdline.manifest
 @RESPATH@/components/htmlMenuBuilder.js
 @RESPATH@/components/htmlMenuBuilder.manifest
 
 @RESPATH@/components/PermissionSettings.js
 @RESPATH@/components/PermissionSettings.manifest
-@RESPATH@/components/ContactManager.js
-@RESPATH@/components/ContactManager.manifest
 @RESPATH@/components/PhoneNumberService.js
 @RESPATH@/components/PhoneNumberService.manifest
 @RESPATH@/components/NotificationStorage.js
 @RESPATH@/components/NotificationStorage.manifest
 @RESPATH@/components/Push.js
 @RESPATH@/components/Push.manifest
 @RESPATH@/components/PushComponents.js
 

--- a/dom/apps/PermissionsTable.jsm
+++ b/dom/apps/PermissionsTable.jsm
@@ -131,21 +131,16 @@ this.PermissionsTable =  { geolocation: 
                              privileged: ALLOW_ACTION,
                              certified: ALLOW_ACTION
                            },
                            "browser:embedded-system-app": {
                              app: DENY_ACTION,
                              privileged: DENY_ACTION,
                              certified: ALLOW_ACTION
                            },
-                           mobileconnection: {
-                             app: DENY_ACTION,
-                             privileged: DENY_ACTION,
-                             certified: ALLOW_ACTION
-                           },
                            mobilenetwork: {
                              app: DENY_ACTION,
                              privileged: ALLOW_ACTION,
                              certified: ALLOW_ACTION
                            },
                            power: {
                              app: DENY_ACTION,
                              privileged: DENY_ACTION,

--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -35,36 +35,32 @@
 #ifdef MOZ_GAMEPAD
 #include "mozilla/dom/GamepadServiceTest.h"
 #endif
 #include "mozilla/dom/PowerManager.h"
 #include "mozilla/dom/WakeLock.h"
 #include "mozilla/dom/power/PowerManagerService.h"
 #include "mozilla/dom/FlyWebPublishedServer.h"
 #include "mozilla/dom/FlyWebService.h"
-#include "mozilla/dom/IccManager.h"
 #include "mozilla/dom/InputPortManager.h"
 #include "mozilla/dom/Permissions.h"
 #include "mozilla/dom/Presentation.h"
 #include "mozilla/dom/ServiceWorkerContainer.h"
 #include "mozilla/dom/StorageManager.h"
 #include "mozilla/dom/TCPSocket.h"
 #include "mozilla/dom/VRDisplay.h"
 #include "mozilla/dom/workers/RuntimeService.h"
 #include "mozilla/Hal.h"
 #include "nsISiteSpecificUserAgent.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/SSE.h"
 #include "mozilla/StaticPtr.h"
 #include "Connection.h"
 #include "mozilla/dom/Event.h" // for nsIDOMEvent::InternalDOMEvent()
 #include "nsGlobalWindow.h"
-#ifdef MOZ_B2G_RIL
-#include "mozilla/dom/MobileConnectionArray.h"
-#endif
 #include "nsIIdleObserver.h"
 #include "nsIPermissionManager.h"
 #include "nsMimeTypes.h"
 #include "nsNetUtil.h"
 #include "nsStringStream.h"
 #include "nsComponentManagerUtils.h"
 #include "nsIStringStream.h"
 #include "nsIHttpChannel.h"
@@ -206,23 +202,19 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMimeTypes)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPlugins)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPermissions)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mGeolocation)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNotification)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mBatteryPromise)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mPowerManager)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mIccManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mInputPortManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mConnection)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mStorageManager)
-#ifdef MOZ_B2G_RIL
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMobileConnections)
-#endif
 #ifdef MOZ_AUDIO_CHANNEL_MANAGER
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mAudioChannelManager)
 #endif
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mMediaDevices)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTimeManager)
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mServiceWorkerContainer)
 
   NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mWindow)
@@ -273,36 +265,25 @@ Navigator::Invalidate()
 
   mBatteryPromise = nullptr;
 
   if (mPowerManager) {
     mPowerManager->Shutdown();
     mPowerManager = nullptr;
   }
 
-  if (mIccManager) {
-    mIccManager->Shutdown();
-    mIccManager = nullptr;
-  }
-
   if (mInputPortManager) {
     mInputPortManager = nullptr;
   }
 
   if (mConnection) {
     mConnection->Shutdown();
     mConnection = nullptr;
   }
 
-#ifdef MOZ_B2G_RIL
-  if (mMobileConnections) {
-    mMobileConnections = nullptr;
-  }
-#endif
-
   mMediaDevices = nullptr;
 
 #ifdef MOZ_AUDIO_CHANNEL_MANAGER
   if (mAudioChannelManager) {
     mAudioChannelManager = nullptr;
   }
 #endif
 
@@ -1621,50 +1602,16 @@ Navigator::GetInputPortManager(ErrorResu
 
 already_AddRefed<LegacyMozTCPSocket>
 Navigator::MozTCPSocket()
 {
   RefPtr<LegacyMozTCPSocket> socket = new LegacyMozTCPSocket(GetWindow());
   return socket.forget();
 }
 
-#ifdef MOZ_B2G_RIL
-
-MobileConnectionArray*
-Navigator::GetMozMobileConnections(ErrorResult& aRv)
-{
-  if (!mMobileConnections) {
-    if (!mWindow) {
-      aRv.Throw(NS_ERROR_UNEXPECTED);
-      return nullptr;
-    }
-    mMobileConnections = new MobileConnectionArray(mWindow);
-  }
-
-  return mMobileConnections;
-}
-
-#endif // MOZ_B2G_RIL
-
-IccManager*
-Navigator::GetMozIccManager(ErrorResult& aRv)
-{
-  if (!mIccManager) {
-    if (!mWindow) {
-      aRv.Throw(NS_ERROR_UNEXPECTED);
-      return nullptr;
-    }
-    NS_ENSURE_TRUE(mWindow->GetDocShell(), nullptr);
-
-    mIccManager = new IccManager(mWindow);
-  }
-
-  return mIccManager;
-}
-
 #ifdef MOZ_GAMEPAD
 void
 Navigator::GetGamepads(nsTArray<RefPtr<Gamepad> >& aGamepads,
                        ErrorResult& aRv)
 {
   if (!mWindow) {
     aRv.Throw(NS_ERROR_UNEXPECTED);
     return;

--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -67,22 +67,17 @@ class GamepadServiceTest;
 class NavigatorUserMediaSuccessCallback;
 class NavigatorUserMediaErrorCallback;
 class MozGetUserMediaDevicesSuccessCallback;
 
 namespace network {
 class Connection;
 } // namespace network
 
-#ifdef MOZ_B2G_RIL
-class MobileConnectionArray;
-#endif
-
 class PowerManager;
-class IccManager;
 class InputPortManager;
 class DeviceStorageAreaListener;
 class Presentation;
 class LegacyMozTCPSocket;
 class VRDisplay;
 class StorageManager;
 
 namespace time {
@@ -209,25 +204,21 @@ public:
                          nsTArray<RefPtr<nsDOMDeviceStorage> >& aStores,
                          ErrorResult& aRv);
 
   already_AddRefed<nsDOMDeviceStorage>
   GetDeviceStorageByNameAndType(const nsAString& aName, const nsAString& aType,
                                 ErrorResult& aRv);
 
   DesktopNotificationCenter* GetMozNotification(ErrorResult& aRv);
-  IccManager* GetMozIccManager(ErrorResult& aRv);
   InputPortManager* GetInputPortManager(ErrorResult& aRv);
   already_AddRefed<LegacyMozTCPSocket> MozTCPSocket();
   network::Connection* GetConnection(ErrorResult& aRv);
   MediaDevices* GetMediaDevices(ErrorResult& aRv);
 
-#ifdef MOZ_B2G_RIL
-  MobileConnectionArray* GetMozMobileConnections(ErrorResult& aRv);
-#endif // MOZ_B2G_RIL
 #ifdef MOZ_GAMEPAD
   void GetGamepads(nsTArray<RefPtr<Gamepad> >& aGamepads, ErrorResult& aRv);
   GamepadServiceTest* RequestGamepadServiceTest();
 #endif // MOZ_GAMEPAD
   already_AddRefed<Promise> GetVRDisplays(ErrorResult& aRv);
   void GetActiveVRDisplays(nsTArray<RefPtr<VRDisplay>>& aDisplays) const;
 #ifdef MOZ_TIME_MANAGER
   time::TimeManager* GetMozTime(ErrorResult& aRv);
@@ -306,22 +297,18 @@ private:
   RefPtr<nsMimeTypeArray> mMimeTypes;
   RefPtr<nsPluginArray> mPlugins;
   RefPtr<Permissions> mPermissions;
   RefPtr<Geolocation> mGeolocation;
   RefPtr<DesktopNotificationCenter> mNotification;
   RefPtr<battery::BatteryManager> mBatteryManager;
   RefPtr<Promise> mBatteryPromise;
   RefPtr<PowerManager> mPowerManager;
-  RefPtr<IccManager> mIccManager;
   RefPtr<InputPortManager> mInputPortManager;
   RefPtr<network::Connection> mConnection;
-#ifdef MOZ_B2G_RIL
-  RefPtr<MobileConnectionArray> mMobileConnections;
-#endif
 #ifdef MOZ_AUDIO_CHANNEL_MANAGER
   RefPtr<system::AudioChannelManager> mAudioChannelManager;
 #endif
   RefPtr<MediaDevices> mMediaDevices;
   nsTArray<nsWeakPtr> mDeviceStorageStores;
   RefPtr<time::TimeManager> mTimeManager;
   RefPtr<ServiceWorkerContainer> mServiceWorkerContainer;
   nsCOMPtr<nsPIDOMWindowInner> mWindow;

--- a/dom/base/test/chrome.ini
+++ b/dom/base/test/chrome.ini
@@ -8,18 +8,16 @@ support-files =
   mozbrowser_api_utils.js
 
 [test_anonymousContent_xul_window.xul]
 [test_bug715041.xul]
 [test_bug715041_removal.xul]
 [test_domrequesthelper.xul]
 [test_navigator_resolve_identity_xrays.xul]
 support-files = file_navigator_resolve_identity_xrays.xul
-[test_navigator_resolve_identity.html]
-support-files = file_navigator_resolve_identity.html
 [test_sendQueryContentAndSelectionSetEvent.html]
 [test_bug1016960.html]
 [test_copypaste.xul]
 subsuite = clipboard
 [test_messagemanager_principal.html]
 [test_messagemanager_send_principal.html]
 skip-if = buildapp == 'mulet'
 [test_bug945152.html]

deleted file mode 100644
--- a/dom/base/test/file_navigator_resolve_identity.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=985827
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 985827</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  function test() {
-    var is = parent.is;
-
-    // Test WebIDL NavigatorProperty objects
-    var x = navigator.mozContacts;
-    is(typeof x, "object", "Should have a mozContacts object");
-    delete navigator.mozContacts;
-    var y = navigator.mozContacts;
-    is(x, y, "Should have gotten the same mozContacts object again");
-  }
-
-  test();
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=985827">Mozilla Bug 985827</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>

--- a/dom/base/test/file_navigator_resolve_identity_xrays.xul
+++ b/dom/base/test/file_navigator_resolve_identity_xrays.xul
@@ -18,18 +18,13 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   addLoadEvent(function() {
     var ok = parent.ok;
     var is = parent.is;
 
     var nav = document.getElementById("t").contentWindow.navigator;
 
     ok(Components.utils.isXrayWrapper(nav), "Should have an Xray here");
-
-    // Test WebIDL NavigatorProperty objects
-    is(typeof nav.mozContacts, "object", "Should have a mozContacts object");
-    is(nav.mozContacts, nav.mozContacts,
-       "Should have gotten the same mozContacts object again");
   });
 
   ]]>
   </script>
 </window>

deleted file mode 100644
--- a/dom/base/test/test_navigator_resolve_identity.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=985827
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 985827</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  /** Test for Bug 985827 **/
-
-  SimpleTest.waitForExplicitFinish();
-
-  addEventListener('load', function() {
-    var iframe = document.createElement("iframe");
-    var dir = "chrome://mochitests/content/chrome/dom/base/test/";
-    iframe.src = dir + "file_navigator_resolve_identity.html";
-    document.body.appendChild(iframe);
-    iframe.onload = function() { SimpleTest.finish(); };
-  });
-
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=985827">Mozilla Bug 985827</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>

--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -583,58 +583,16 @@ DOMInterfaces = {
     'nativeType': 'mozilla::dom::HTMLCanvasPrintState',
 },
 
 'MozChannel': {
     'nativeType': 'nsIChannel',
     'notflattened': True
 },
 
-'MozCdmaIccInfo': {
-    'headerFile': 'mozilla/dom/IccInfo.h',
-    'nativeType': 'mozilla::dom::CdmaIccInfo',
-},
-
-'MozGsmIccInfo': {
-    'headerFile': 'mozilla/dom/IccInfo.h',
-    'nativeType': 'mozilla::dom::GsmIccInfo',
-},
-
-'MozIcc': {
-    'nativeType': 'mozilla::dom::Icc',
-},
-
-'MozIccInfo': {
-    'nativeType': 'mozilla::dom::IccInfo',
-},
-
-'MozIccManager': {
-    'nativeType': 'mozilla::dom::IccManager',
-},
-
-'MozMobileCellInfo': {
-    'nativeType': 'mozilla::dom::MobileCellInfo',
-},
-
-'MozMobileConnection': {
-    'nativeType': 'mozilla::dom::MobileConnection',
-},
-
-'MozMobileConnectionArray': {
-    'nativeType': 'mozilla::dom::MobileConnectionArray',
-},
-
-'MozMobileConnectionInfo': {
-    'nativeType': 'mozilla::dom::MobileConnectionInfo',
-},
-
-'MozMobileNetworkInfo': {
-    'nativeType': 'mozilla::dom::MobileNetworkInfo',
-},
-
 'MozSpeakerManager': {
     'nativeType': 'mozilla::dom::SpeakerManager',
     'headerFile': 'SpeakerManager.h'
 },
 
 'MozPowerManager': {
     'nativeType': 'mozilla::dom::PowerManager',
 },

--- a/dom/bindings/test/chrome.ini
+++ b/dom/bindings/test/chrome.ini
@@ -1,20 +1,16 @@
 [DEFAULT]
 skip-if = buildapp == 'b2g'
 support-files =
-  file_bug707564.html
-  file_bug707564-2.html
-  !/dom/bindings/test/file_bug707564.html
   !/dom/bindings/test/file_bug775543.html
   !/dom/bindings/test/file_document_location_set_via_xray.html
   !/dom/bindings/test/file_dom_xrays.html
   !/dom/bindings/test/file_proxies_via_xray.html
 
-[test_bug707564.html]
 [test_bug775543.html]
 [test_document_location_set_via_xray.html]
 [test_dom_xrays.html]
 [test_proxies_via_xray.html]
 [test_document_location_via_xray_cached.html]
 [test_blacklisted_prerendering_function.xul]
 support-files =
   file_focuser.html

deleted file mode 100644
--- a/dom/bindings/test/file_bug707564-2.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=707564
--->
-<head>
-  <meta charset="utf-8">
-  <title>Test for Bug 707564</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-  <script type="application/javascript">
-
-  /** Test for Bug 707564 **/
-  var ok = parent.ok;
-  var isnot = parent.isnot;
-
-  addLoadEvent(function() {
-    var props = Object.getOwnPropertyNames(Object.getPrototypeOf(frames[0].navigator));
-    isnot(props.indexOf("mozContacts"), -1,
-          "Should enumerate a mozContacts property on navigator");
-
-    // Now enumerate a different navigator object
-    var found = false;
-    for (var name in frames[1].navigator) {
-      if (name == "mozContacts") {
-        found = true;
-      }
-    }
-    ok(found, "Should enumerate a mozContacts property on navigator via for...in");
-    parent.SimpleTest.finish();
-  });
-
-  </script>
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=707564">Mozilla Bug 707564</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-<iframe></iframe>
-<iframe></iframe>
-</div>
-<pre id="test">
-</pre>
-</body>
-</html>

deleted file mode 100644
--- a/dom/bindings/test/file_bug707564.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<body>
-<script>
-  navigator.foopy = 5;
-</script>
-</body>

deleted file mode 100644
--- a/dom/bindings/test/test_bug707564.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css"/>
-</head>
-<body>
-<iframe></iframe>
-<pre id="test">
-<script type="application/javascript">
-
-function run_tests() {
-  var iframe = document.querySelector("iframe");
-  iframe.src = "file_bug707564-2.html";
-}
-
-SimpleTest.waitForExplicitFinish();
-
-addEventListener('load', run_tests);
-
-</script>
-</pre>
-</body>
-</html>

--- a/dom/bindings/test/test_dom_xrays.html
+++ b/dom/bindings/test/test_dom_xrays.html
@@ -143,30 +143,16 @@ function test()
   checkXrayProperty(coll, 0, [ doc.getElementById("shadowedIframe") ]);
 
   // WebIDL-defined properties live on the prototype, overriding any named properties.
   checkXrayProperty(coll, "item", [ undefined, win.HTMLCollection.prototype.item ]);
 
   // ECMAScript-defined properties live on the prototype, overriding any named properties.
   checkXrayProperty(coll, "toString", [ undefined, undefined, win.Object.prototype.toString ]);
 
-  // NavigatorProperty things should come from the target compartment, always.
-  var contacts = win.navigator.mozContacts;
-  isnot(contacts, undefined,
-        "Must have a mozContacts for this to work.  Find another " +
-        "NavigatorProperty, or remove all this NavigatorProperty code")
-  ok(Cu.isXrayWrapper(contacts),
-     "Should have an Xray for the underlying value, not a value newly " +
-     "created for us");
-  is(Cu.getGlobalForObject(contacts), win,
-     "contacts should come from the underlying window");
-  // Unfortunately, I can't figure out a decent way to test that we're not
-  // creating a separate thing from the thing content sees, because none of the
-  // NavigatorProperty things are available to content.
-
   // Frozen arrays should come from our compartment, not the target one.
   var languages1 = win.navigator.languages;
   isnot(languages1, undefined, "Must have .languages");
   ok(Array.isArray(languages1), ".languages should be an array");
   ok(Object.isFrozen(languages1), ".languages should be a frozen array");
   ok(!Cu.isXrayWrapper(languages1), "Should have our own version of array");
   is(Cu.getGlobalForObject(languages1), window,
      "languages1 should come from our window");

deleted file mode 100644
--- a/dom/contacts/ContactManager.js
+++ /dev/null
@@ -1,541 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-const DEBUG = false;
-function debug(s) { dump("-*- ContactManager: " + s + "\n"); }
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-const Cu = Components.utils;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/DOMRequestHelper.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(Services, "DOMRequest",
-                                   "@mozilla.org/dom/dom-request-service;1",
-                                   "nsIDOMRequestService");
-
-XPCOMUtils.defineLazyServiceGetter(this, "cpmm",
-                                   "@mozilla.org/childprocessmessagemanager;1",
-                                   "nsIMessageSender");
-
-const CONTACTS_SENDMORE_MINIMUM = 5;
-
-// We need this to create a copy of the mozContact object in ContactManager.save
-// Keep in sync with the interfaces.
-const PROPERTIES = [
-  "name", "honorificPrefix", "givenName", "additionalName", "familyName",
-  "phoneticGivenName", "phoneticFamilyName",
-  "honorificSuffix", "nickname", "photo", "category", "org", "jobTitle",
-  "bday", "note", "anniversary", "sex", "genderIdentity", "key", "adr", "email",
-  "url", "impp", "tel"
-];
-
-var mozContactInitWarned = false;
-
-function Contact() { }
-
-Contact.prototype = {
-  __init: function(aProp) {
-    for (let prop in aProp) {
-      this[prop] = aProp[prop];
-    }
-  },
-
-  init: function(aProp) {
-    // init is deprecated, warn once in the console if it's used
-    if (!mozContactInitWarned) {
-      mozContactInitWarned = true;
-      Cu.reportError("mozContact.init is DEPRECATED. Use the mozContact constructor instead. " +
-                     "See https://developer.mozilla.org/docs/WebAPI/Contacts for details.");
-    }
-
-    for (let prop of PROPERTIES) {
-      this[prop] = aProp[prop];
-    }
-  },
-
-  setMetadata: function(aId, aPublished, aUpdated) {
-    this.id = aId;
-    if (aPublished) {
-      this.published = aPublished;
-    }
-    if (aUpdated) {
-      this.updated = aUpdated;
-    }
-  },
-
-  classID: Components.ID("{72a5ee28-81d8-4af8-90b3-ae935396cc66}"),
-  contractID: "@mozilla.org/contact;1",
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupports]),
-};
-
-function ContactManager() { }
-
-ContactManager.prototype = {
-  __proto__: DOMRequestIpcHelper.prototype,
-  hasListenPermission: false,
-  _cachedContacts: [] ,
-
-  set oncontactchange(aHandler) {
-    this.__DOM_IMPL__.setEventHandler("oncontactchange", aHandler);
-  },
-
-  get oncontactchange() {
-    return this.__DOM_IMPL__.getEventHandler("oncontactchange");
-  },
-
-  _convertContact: function(aContact) {
-    let properties = aContact.properties;
-    if (properties.photo && properties.photo.length) {
-      properties.photo = Cu.cloneInto(properties.photo, this._window);
-    }
-    let newContact = new this._window.mozContact(aContact.properties);
-    newContact.setMetadata(aContact.id, aContact.published, aContact.updated);
-    return newContact;
-  },
-
-  _convertContacts: function(aContacts) {
-    let contacts = new this._window.Array();
-    for (let i in aContacts) {
-      contacts.push(this._convertContact(aContacts[i]));
-    }
-    return contacts;
-  },
-
-  _fireSuccessOrDone: function(aCursor, aResult) {
-    if (aResult == null) {
-      Services.DOMRequest.fireDone(aCursor);
-    } else {
-      Services.DOMRequest.fireSuccess(aCursor, aResult);
-    }
-  },
-
-  _pushArray: function(aArr1, aArr2) {
-    aArr1.push.apply(aArr1, aArr2);
-  },
-
-  receiveMessage: function(aMessage) {
-    if (DEBUG) debug("receiveMessage: " + aMessage.name);
-    let msg = aMessage.json;
-    let contacts = msg.contacts;
-
-    let req;
-    switch (aMessage.name) {
-      case "Contacts:Find:Return:OK":
-        req = this.getRequest(msg.requestID);
-        if (req) {
-          let result = this._convertContacts(contacts);
-          Services.DOMRequest.fireSuccess(req.request, result);
-        } else {
-          if (DEBUG) debug("no request stored!" + msg.requestID);
-        }
-        break;
-      case "Contacts:GetAll:Next":
-        let data = this.getRequest(msg.cursorId);
-        if (!data) {
-          break;
-        }
-        let result = contacts ? this._convertContacts(contacts) : [null];
-        if (data.waitingForNext) {
-          if (DEBUG) debug("cursor waiting for contact, sending");
-          data.waitingForNext = false;
-          let contact = result.shift();
-          this._pushArray(data.cachedContacts, result);
-          this.nextTick(this._fireSuccessOrDone.bind(this, data.cursor, contact));
-          if (!contact) {
-            this.removeRequest(msg.cursorId);
-          }
-        } else {
-          if (DEBUG) debug("cursor not waiting, saving");
-          this._pushArray(data.cachedContacts, result);
-        }
-        break;
-      case "Contact:Save:Return:OK":
-        // If a cached contact was saved and a new contact ID was returned, update the contact's ID
-        if (this._cachedContacts[msg.requestID]) {
-          if (msg.contactID) {
-            this._cachedContacts[msg.requestID].id = msg.contactID;
-          }
-          delete this._cachedContacts[msg.requestID];
-        }
-      case "Contacts:Clear:Return:OK":
-      case "Contact:Remove:Return:OK":
-        req = this.getRequest(msg.requestID);
-        if (req)
-          Services.DOMRequest.fireSuccess(req.request, null);
-        break;
-      case "Contacts:Find:Return:KO":
-      case "Contact:Save:Return:KO":
-      case "Contact:Remove:Return:KO":
-      case "Contacts:Clear:Return:KO":
-      case "Contacts:GetRevision:Return:KO":
-      case "Contacts:Count:Return:KO":
-        req = this.getRequest(msg.requestID);
-        if (req) {
-          if (req.request) {
-            req = req.request;
-          }
-          Services.DOMRequest.fireError(req, msg.errorMsg);
-        }
-        break;
-      case "Contacts:GetAll:Return:KO":
-        req = this.getRequest(msg.requestID);
-        if (req) {
-          Services.DOMRequest.fireError(req.cursor, msg.errorMsg);
-        }
-        break;
-      case "Contact:Changed":
-        // Fire oncontactchange event
-        if (DEBUG) debug("Contacts:ContactChanged: " + msg.contactID + ", " + msg.reason);
-        let event = new this._window.MozContactChangeEvent("contactchange", {
-          contactID: msg.contactID,
-          reason: msg.reason
-        });
-        this.dispatchEvent(event);
-        break;
-      case "Contacts:Revision":
-        if (DEBUG) debug("new revision: " + msg.revision);
-        req = this.getRequest(msg.requestID);
-        if (req) {
-          Services.DOMRequest.fireSuccess(req.request, msg.revision);
-        }
-        break;
-      case "Contacts:Count":
-        if (DEBUG) debug("count: " + msg.count);
-        req = this.getRequest(msg.requestID);
-        if (req) {
-          Services.DOMRequest.fireSuccess(req.request, msg.count);
-        }
-        break;
-      default:
-        if (DEBUG) debug("Wrong message: " + aMessage.name);
-    }
-    this.removeRequest(msg.requestID);
-  },
-
-  dispatchEvent: function(event) {
-    if (this.hasListenPermission) {
-      this.__DOM_IMPL__.dispatchEvent(event);
-    }
-  },
-
-  askPermission: function (aAccess, aRequest, aAllowCallback, aCancelCallback) {
-    if (DEBUG) debug("askPermission for contacts");
-
-    let access;
-    switch(aAccess) {
-      case "create":
-        access = "create";
-        break;
-      case "update":
-      case "remove":
-        access = "write";
-        break;
-      case "find":
-      case "listen":
-      case "revision":
-      case "count":
-        access = "read";
-        break;
-      default:
-        access = "unknown";
-      }
-
-    // Shortcut for ALLOW_ACTION so we avoid a parent roundtrip
-    let principal = this._window.document.nodePrincipal;
-    let type = "contacts-" + access;
-    let permValue =
-      Services.perms.testExactPermissionFromPrincipal(principal, type);
-    DEBUG && debug("Existing permission " + permValue);
-    if (permValue == Ci.nsIPermissionManager.ALLOW_ACTION) {
-      if (aAllowCallback) {
-        aAllowCallback();
-      }
-      return;
-    } else if (permValue == Ci.nsIPermissionManager.DENY_ACTION ||
-               permValue == Ci.nsIPermissionManager.UNKNOWN_ACTION) {
-      if (aCancelCallback) {
-        aCancelCallback("PERMISSION_DENIED");
-      }
-      return;
-    }
-
-    // Create an array with a single nsIContentPermissionType element.
-    type = {
-      type: "contacts",
-      access: access,
-      options: [],
-      QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionType])
-    };
-    let typeArray = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
-    typeArray.appendElement(type, false);
-
-    // create a nsIContentPermissionRequest
-    let request = {
-      types: typeArray,
-      principal: principal,
-      QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPermissionRequest]),
-      allow: function() {
-        aAllowCallback && aAllowCallback();
-        DEBUG && debug("Permission granted. Access " + access +"\n");
-      },
-      cancel: function() {
-        aCancelCallback && aCancelCallback("PERMISSION_DENIED");
-        DEBUG && debug("Permission denied. Access " + access +"\n");
-      },
-      window: this._window
-    };
-
-    // Using askPermission from nsIDOMWindowUtils that takes care of the
-    // remoting if needed.
-    let windowUtils = this._window.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsIDOMWindowUtils);
-    windowUtils.askPermission(request);
-  },
-
-  save: function save(aContact) {
-    // We have to do a deep copy of the contact manually here because
-    // nsFrameMessageManager doesn't know how to create a structured clone of a
-    // mozContact object.
-    let newContact = {properties: {}};
-
-    try {
-      for (let field of PROPERTIES) {
-        // This hack makes sure modifications to the sequence attributes get validated.
-        aContact[field] = aContact[field];
-        newContact.properties[field] = aContact[field];
-      }
-    } catch (e) {
-      // And then make sure we throw a proper error message (no internal file and line #)
-      throw new this._window.Error(e.message);
-    }
-
-    let request = this.createRequest();
-    let requestID = this.getRequestId({request: request});
-
-    let reason;
-    if (aContact.id == "undefined") {
-      // for example {25c00f01-90e5-c545-b4d4-21E2ddbab9e0} becomes
-      // 25c00f0190e5c545b4d421E2ddbab9e0
-      aContact.id = this._getRandomId().replace(/[{}-]/g, "");
-      // Cache the contact so that its ID may be updated later if necessary
-      this._cachedContacts[requestID] = aContact;
-      reason = "create";
-    } else {
-      reason = "update";
-    }
-
-    newContact.id = aContact.id;
-    newContact.published = aContact.published;
-    newContact.updated = aContact.updated;
-
-    if (DEBUG) debug("send: " + JSON.stringify(newContact));
-
-    let options = { contact: newContact, reason: reason };
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contact:Save", {
-        requestID: requestID,
-        options: options
-      });
-    }.bind(this);
-
-    let cancelCallback = function(reason) {
-      Services.DOMRequest.fireErrorAsync(request, reason);
-    };
-
-    this.askPermission(reason, request, allowCallback, cancelCallback);
-    return request;
-  },
-
-  find: function(aOptions) {
-    if (DEBUG) debug("find! " + JSON.stringify(aOptions));
-    let request = this.createRequest();
-    let options = { findOptions: aOptions };
-
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contacts:Find", {
-        requestID: this.getRequestId({request: request, reason: "find"}),
-        options: options
-      });
-    }.bind(this);
-
-    let cancelCallback = function(reason) {
-      Services.DOMRequest.fireErrorAsync(request, reason);
-    };
-
-    this.askPermission("find", request, allowCallback, cancelCallback);
-    return request;
-  },
-
-  createCursor: function CM_createCursor(aRequest) {
-    let data = {
-      cursor: Services.DOMRequest.createCursor(this._window, function() {
-        this.handleContinue(id);
-      }.bind(this)),
-      cachedContacts: [],
-      waitingForNext: true,
-    };
-    let id = this.getRequestId(data);
-    if (DEBUG) debug("saved cursor id: " + id);
-    return [id, data.cursor];
-  },
-
-  getAll: function CM_getAll(aOptions) {
-    if (DEBUG) debug("getAll: " + JSON.stringify(aOptions));
-    let [cursorId, cursor] = this.createCursor();
-
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contacts:GetAll", {
-        cursorId: cursorId,
-        findOptions: aOptions
-      });
-    }.bind(this);
-
-    let cancelCallback = function(reason) {
-      Services.DOMRequest.fireErrorAsync(cursor, reason);
-    };
-
-    this.askPermission("find", cursor, allowCallback, cancelCallback);
-    return cursor;
-  },
-
-  nextTick: function nextTick(aCallback) {
-    Services.tm.currentThread.dispatch(aCallback, Ci.nsIThread.DISPATCH_NORMAL);
-  },
-
-  handleContinue: function CM_handleContinue(aCursorId) {
-    if (DEBUG) debug("handleContinue: " + aCursorId);
-    let data = this.getRequest(aCursorId);
-    if (data.cachedContacts.length > 0) {
-      if (DEBUG) debug("contact in cache");
-      let contact = data.cachedContacts.shift();
-      this.nextTick(this._fireSuccessOrDone.bind(this, data.cursor, contact));
-      if (!contact) {
-        this.removeRequest(aCursorId);
-      } else if (data.cachedContacts.length === CONTACTS_SENDMORE_MINIMUM) {
-        cpmm.sendAsyncMessage("Contacts:GetAll:SendNow", { cursorId: aCursorId });
-      }
-    } else {
-      if (DEBUG) debug("waiting for contact");
-      data.waitingForNext = true;
-    }
-  },
-
-  remove: function removeContact(aRecordOrId) {
-    let request = this.createRequest();
-    let id;
-    if (typeof aRecordOrId === "string") {
-      id = aRecordOrId;
-    } else if (!aRecordOrId || !aRecordOrId.id) {
-      Services.DOMRequest.fireErrorAsync(request, true);
-      return request;
-    } else {
-      id = aRecordOrId.id;
-    }
-
-    let options = { id: id };
-
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contact:Remove", {
-        requestID: this.getRequestId({request: request, reason: "remove"}),
-        options: options
-      });
-    }.bind(this);
-
-    let cancelCallback = function(reason) {
-      Services.DOMRequest.fireErrorAsync(request, reason);
-    };
-
-    this.askPermission("remove", request, allowCallback, cancelCallback);
-    return request;
-  },
-
-  clear: function() {
-    if (DEBUG) debug("clear");
-    let request = this.createRequest();
-    let options = {};
-
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contacts:Clear", {
-        requestID: this.getRequestId({request: request, reason: "remove"}),
-        options: options
-      });
-    }.bind(this);
-
-    let cancelCallback = function(reason) {
-      Services.DOMRequest.fireErrorAsync(request, reason);
-    };
-
-    this.askPermission("remove", request, allowCallback, cancelCallback);
-    return request;
-  },
-
-  getRevision: function() {
-    let request = this.createRequest();
-
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contacts:GetRevision", {
-        requestID: this.getRequestId({ request: request })
-      });
-    }.bind(this);
-
-    let cancelCallback = function(reason) {
-      Services.DOMRequest.fireErrorAsync(request, reason);
-    };
-
-    this.askPermission("revision", request, allowCallback, cancelCallback);
-    return request;
-  },
-
-  getCount: function() {
-    let request = this.createRequest();
-
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contacts:GetCount", {
-        requestID: this.getRequestId({ request: request })
-      });
-    }.bind(this);
-
-    let cancelCallback = function(reason) {
-      Services.DOMRequest.fireErrorAsync(request, reason);
-    };
-
-    this.askPermission("count", request, allowCallback, cancelCallback);
-    return request;
-  },
-
-  init: function(aWindow) {
-    // DOMRequestIpcHelper.initHelper sets this._window
-    this.initDOMRequestHelper(aWindow, ["Contacts:Find:Return:OK", "Contacts:Find:Return:KO",
-                              "Contacts:Clear:Return:OK", "Contacts:Clear:Return:KO",
-                              "Contact:Save:Return:OK", "Contact:Save:Return:KO",
-                              "Contact:Remove:Return:OK", "Contact:Remove:Return:KO",
-                              "Contact:Changed",
-                              "Contacts:GetAll:Next", "Contacts:GetAll:Return:KO",
-                              "Contacts:Count",
-                              "Contacts:Revision", "Contacts:GetRevision:Return:KO",]);
-
-
-    let allowCallback = function() {
-      cpmm.sendAsyncMessage("Contacts:RegisterForMessages");
-      this.hasListenPermission = true;
-    }.bind(this);
-
-    this.askPermission("listen", null, allowCallback);
-  },
-
-  classID: Components.ID("{8beb3a66-d70a-4111-b216-b8e995ad3aff}"),
-  contractID: "@mozilla.org/contactManager;1",
-  QueryInterface: XPCOMUtils.generateQI([Ci.nsISupportsWeakReference,
-                                         Ci.nsIObserver,
-                                         Ci.nsIDOMGlobalPropertyInitializer]),
-};
-
-this.NSGetFactory = XPCOMUtils.generateNSGetFactory([
-  Contact, ContactManager
-]);

deleted file mode 100644
--- a/dom/contacts/ContactManager.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-component {72a5ee28-81d8-4af8-90b3-ae935396cc66} ContactManager.js
-contract @mozilla.org/contact;1 {72a5ee28-81d8-4af8-90b3-ae935396cc66}
-
-component {8beb3a66-d70a-4111-b216-b8e995ad3aff} ContactManager.js
-contract @mozilla.org/contactManager;1 {8beb3a66-d70a-4111-b216-b8e995ad3aff}

deleted file mode 100644
--- a/dom/contacts/fallback/ContactDB.jsm
+++ /dev/null
@@ -1,1401 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-// Everything but "ContactDB" is only exported here for testing.
-this.EXPORTED_SYMBOLS = ["ContactDB", "DB_NAME", "STORE_NAME", "SAVED_GETALL_STORE_NAME",
-                         "REVISION_STORE", "DB_VERSION"];
-
-const DEBUG = false;
-function debug(s) { dump("-*- ContactDB component: " + s + "\n"); }
-
-const Cu = Components.utils;
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/IndexedDBHelper.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils",
-                                  "resource://gre/modules/PhoneNumberUtils.jsm");
-Cu.importGlobalProperties(["indexedDB"]);
-
-/* all exported symbols need to be bound to this on B2G - Bug 961777 */
-this.DB_NAME = "contacts";
-this.DB_VERSION = 20;
-this.STORE_NAME = "contacts";
-this.SAVED_GETALL_STORE_NAME = "getallcache";
-const CHUNK_SIZE = 20;
-this.REVISION_STORE = "revision";
-const REVISION_KEY = "revision";
-
-function exportContact(aRecord) {
-  if (aRecord) {
-    delete aRecord.search;
-  }
-  return aRecord;
-}
-
-function ContactDispatcher(aContacts, aFullContacts, aCallback, aNewTxn, aClearDispatcher, aFailureCb) {
-  let nextIndex = 0;
-
-  let sendChunk;
-  let count = 0;
-  if (aFullContacts) {
-    sendChunk = function() {
-      try {
-        let chunk = aContacts.splice(0, CHUNK_SIZE);
-        if (chunk.length > 0) {
-          aCallback(chunk);
-        }
-        if (aContacts.length === 0) {
-          aCallback(null);
-          aClearDispatcher();
-        }
-      } catch (e) {
-        aClearDispatcher();
-      }
-    }
-  } else {
-    sendChunk = function() {
-      try {
-        let start = nextIndex;
-        nextIndex += CHUNK_SIZE;
-        let chunk = [];
-        aNewTxn("readonly", STORE_NAME, function(txn, store) {
-          for (let i = start; i < Math.min(start+CHUNK_SIZE, aContacts.length); ++i) {
-            store.get(aContacts[i]).onsuccess = function(e) {
-              chunk.push(exportContact(e.target.result));
-              count++;
-              if (count === aContacts.length) {
-                aCallback(chunk);
-                aCallback(null);
-                aClearDispatcher();
-              } else if (chunk.length === CHUNK_SIZE) {
-                aCallback(chunk);
-                chunk.length = 0;
-              }
-            }
-          }
-        }, null, function(errorMsg) {
-          aFailureCb(errorMsg);
-        });
-      } catch (e) {
-        aClearDispatcher();
-      }
-    }
-  }
-
-  return {
-    sendNow: function() {
-      sendChunk();
-    }
-  };
-}
-
-this.ContactDB = function ContactDB() {
-  if (DEBUG) debug("Constructor");
-};
-
-ContactDB.prototype = {
-  __proto__: IndexedDBHelper.prototype,
-
-  _dispatcher: {},
-
-  useFastUpgrade: true,
-
-  upgradeSchema: function upgradeSchema(aTransaction, aDb, aOldVersion, aNewVersion) {
-    let loadInitialContacts = function() {
-      // Add default contacts
-      let jsm = {};
-      Cu.import("resource://gre/modules/FileUtils.jsm", jsm);
-      Cu.import("resource://gre/modules/NetUtil.jsm", jsm);
-      // Loading resource://app/defaults/contacts.json doesn't work because
-      // contacts.json is not in the omnijar.
-      // So we look for the app dir instead and go from here...
-      let contactsFile = jsm.FileUtils.getFile("DefRt", ["contacts.json"], false);
-      if (!contactsFile || (contactsFile && !contactsFile.exists())) {
-        // For b2g desktop
-        contactsFile = jsm.FileUtils.getFile("ProfD", ["contacts.json"], false);
-        if (!contactsFile || (contactsFile && !contactsFile.exists())) {
-          return;
-        }
-      }
-
-      let chan = jsm.NetUtil.newChannel({
-        uri: NetUtil.newURI(contactsFile),
-        loadUsingSystemPrincipal: true});
-
-      let stream = chan.open2();
-      // Obtain a converter to read from a UTF-8 encoded input stream.
-      let converter = Cc["@mozilla.org/intl/scriptableunicodeconverter"]
-                      .createInstance(Ci.nsIScriptableUnicodeConverter);
-      converter.charset = "UTF-8";
-      let rawstr = converter.ConvertToUnicode(jsm.NetUtil.readInputStreamToString(
-                                              stream,
-                                              stream.available()) || "");
-      stream.close();
-      let contacts;
-      try {
-        contacts = JSON.parse(rawstr);
-      } catch(e) {
-        if (DEBUG) debug("Error parsing " + contactsFile.path + " : " + e);
-        return;
-      }
-
-      let idService = Cc["@mozilla.org/uuid-generator;1"].getService(Ci.nsIUUIDGenerator);
-      objectStore = aTransaction.objectStore(STORE_NAME);
-
-      for (let i = 0; i < contacts.length; i++) {
-        let contact = {};
-        contact.properties = contacts[i];
-        contact.id = idService.generateUUID().toString().replace(/[{}-]/g, "");
-        contact = this.makeImport(contact);
-        this.updateRecordMetadata(contact);
-        if (DEBUG) debug("import: " + JSON.stringify(contact));
-        objectStore.put(contact);
-      }
-    }.bind(this);
-
-    function createFinalSchema() {
-      if (DEBUG) debug("creating final schema");
-      let objectStore = aDb.createObjectStore(STORE_NAME, {keyPath: "id"});
-      objectStore.createIndex("familyName", "properties.familyName", { multiEntry: true });
-      objectStore.createIndex("givenName",  "properties.givenName",  { multiEntry: true });
-      objectStore.createIndex("name",      "properties.name",        { multiEntry: true });
-      objectStore.createIndex("familyNameLowerCase", "search.familyName", { multiEntry: true });
-      objectStore.createIndex("givenNameLowerCase",  "search.givenName",  { multiEntry: true });
-      objectStore.createIndex("nameLowerCase",       "search.name",       { multiEntry: true });
-      objectStore.createIndex("telLowerCase",        "search.tel",        { multiEntry: true });
-      objectStore.createIndex("emailLowerCase",      "search.email",      { multiEntry: true });
-      objectStore.createIndex("tel", "search.exactTel", { multiEntry: true });
-      objectStore.createIndex("category", "properties.category", { multiEntry: true });
-      objectStore.createIndex("email", "search.email", { multiEntry: true });
-      objectStore.createIndex("telMatch", "search.parsedTel", {multiEntry: true});
-      objectStore.createIndex("phoneticFamilyName", "properties.phoneticFamilyName", { multiEntry: true });
-      objectStore.createIndex("phoneticGivenName", "properties.phoneticGivenName", { multiEntry: true });
-      objectStore.createIndex("phoneticFamilyNameLowerCase", "search.phoneticFamilyName", { multiEntry: true });
-      objectStore.createIndex("phoneticGivenNameLowerCase",  "search.phoneticGivenName",  { multiEntry: true });
-      aDb.createObjectStore(SAVED_GETALL_STORE_NAME);
-      aDb.createObjectStore(REVISION_STORE).put(0, REVISION_KEY);
-    }
-
-    let valueUpgradeSteps = [];
-
-    function scheduleValueUpgrade(upgradeFunc) {
-      var length = valueUpgradeSteps.push(upgradeFunc);
-      if (DEBUG) debug("Scheduled a value upgrade function, index " + (length - 1));
-    }
-
-    // We always output this debug line because it's useful and the noise ratio
-    // very low.
-    debug("upgrade schema from: " + aOldVersion + " to " + aNewVersion + " called!");
-    let db = aDb;
-    let objectStore;
-
-    if (aOldVersion === 0 && this.useFastUpgrade) {
-      createFinalSchema();
-      loadInitialContacts();
-      return;
-    }
-
-    let steps = [
-      function upgrade0to1() {
-        /**
-         * Create the initial database schema.
-         *
-         * The schema of records stored is as follows:
-         *
-         * {id:            "...",       // UUID
-         *  published:     Date(...),   // First published date.
-         *  updated:       Date(...),   // Last updated date.
-         *  properties:    {...}        // Object holding the ContactProperties
-         * }
-         */
-        if (DEBUG) debug("create schema");
-        objectStore = db.createObjectStore(STORE_NAME, {keyPath: "id"});
-
-        // Properties indexes
-        objectStore.createIndex("familyName", "properties.familyName", { multiEntry: true });
-        objectStore.createIndex("givenName",  "properties.givenName",  { multiEntry: true });
-
-        objectStore.createIndex("familyNameLowerCase", "search.familyName", { multiEntry: true });
-        objectStore.createIndex("givenNameLowerCase",  "search.givenName",  { multiEntry: true });
-        objectStore.createIndex("telLowerCase",        "search.tel",        { multiEntry: true });
-        objectStore.createIndex("emailLowerCase",      "search.email",      { multiEntry: true });
-        next();
-      },
-      function upgrade1to2() {
-        if (DEBUG) debug("upgrade 1");
-
-        // Create a new scheme for the tel field. We move from an array of tel-numbers to an array of
-        // ContactTelephone.
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-        // Delete old tel index.
-        if (objectStore.indexNames.contains("tel")) {
-          objectStore.deleteIndex("tel");
-        }
-
-        // Upgrade existing tel field in the DB.
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (DEBUG) debug("upgrade tel1: " + JSON.stringify(cursor.value));
-            for (let number in cursor.value.properties.tel) {
-              cursor.value.properties.tel[number] = {number: number};
-            }
-            cursor.update(cursor.value);
-            if (DEBUG) debug("upgrade tel2: " + JSON.stringify(cursor.value));
-            cursor.continue();
-          } else {
-            next();
-          }
-        };
-
-        // Create new searchable indexes.
-        objectStore.createIndex("tel", "search.tel", { multiEntry: true });
-        objectStore.createIndex("category", "properties.category", { multiEntry: true });
-      },
-      function upgrade2to3() {
-        if (DEBUG) debug("upgrade 2");
-        // Create a new scheme for the email field. We move from an array of emailaddresses to an array of
-        // ContactEmail.
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-
-        // Delete old email index.
-        if (objectStore.indexNames.contains("email")) {
-          objectStore.deleteIndex("email");
-        }
-
-        // Upgrade existing email field in the DB.
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (cursor.value.properties.email) {
-              if (DEBUG) debug("upgrade email1: " + JSON.stringify(cursor.value));
-              cursor.value.properties.email =
-                cursor.value.properties.email.map(function(address) { return { address: address }; });
-              cursor.update(cursor.value);
-              if (DEBUG) debug("upgrade email2: " + JSON.stringify(cursor.value));
-            }
-            cursor.continue();
-          } else {
-            next();
-          }
-        };
-
-        // Create new searchable indexes.
-        objectStore.createIndex("email", "search.email", { multiEntry: true });
-      },
-      function upgrade3to4() {
-        if (DEBUG) debug("upgrade 3");
-
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-
-        // Upgrade existing impp field in the DB.
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (cursor.value.properties.impp) {
-              if (DEBUG) debug("upgrade impp1: " + JSON.stringify(cursor.value));
-              cursor.value.properties.impp =
-                cursor.value.properties.impp.map(function(value) { return { value: value }; });
-              cursor.update(cursor.value);
-              if (DEBUG) debug("upgrade impp2: " + JSON.stringify(cursor.value));
-            }
-            cursor.continue();
-          }
-        };
-        // Upgrade existing url field in the DB.
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (cursor.value.properties.url) {
-              if (DEBUG) debug("upgrade url1: " + JSON.stringify(cursor.value));
-              cursor.value.properties.url =
-                cursor.value.properties.url.map(function(value) { return { value: value }; });
-              cursor.update(cursor.value);
-              if (DEBUG) debug("upgrade impp2: " + JSON.stringify(cursor.value));
-            }
-            cursor.continue();
-          } else {
-            next();
-          }
-        };
-      },
-      function upgrade4to5() {
-        if (DEBUG) debug("Add international phone numbers upgrade");
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (cursor.value.properties.tel) {
-              if (DEBUG) debug("upgrade : " + JSON.stringify(cursor.value));
-              cursor.value.properties.tel.forEach(
-                function(duple) {
-                  let parsedNumber = PhoneNumberUtils.parse(duple.value.toString());
-                  if (parsedNumber) {
-                    if (DEBUG) {
-                      debug("InternationalFormat: " + parsedNumber.internationalFormat);
-                      debug("InternationalNumber: " + parsedNumber.internationalNumber);
-                      debug("NationalNumber: " + parsedNumber.nationalNumber);
-                      debug("NationalFormat: " + parsedNumber.nationalFormat);
-                    }
-                    if (duple.value.toString() !== parsedNumber.internationalNumber) {
-                      cursor.value.search.tel.push(parsedNumber.internationalNumber);
-                    }
-                  } else {
-                    dump("Warning: No international number found for " + duple.value + "\n");
-                  }
-                }
-              )
-              cursor.update(cursor.value);
-            }
-            if (DEBUG) debug("upgrade2 : " + JSON.stringify(cursor.value));
-            cursor.continue();
-          } else {
-            next();
-          }
-        };
-      },
-      function upgrade5to6() {
-        if (DEBUG) debug("Add index for equals tel searches");
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-
-        // Delete old tel index (not on the right field).
-        if (objectStore.indexNames.contains("tel")) {
-          objectStore.deleteIndex("tel");
-        }
-
-        // Create new index for "equals" searches
-        objectStore.createIndex("tel", "search.exactTel", { multiEntry: true });
-
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (cursor.value.properties.tel) {
-              if (DEBUG) debug("upgrade : " + JSON.stringify(cursor.value));
-              cursor.value.properties.tel.forEach(
-                function(duple) {
-                  let number = duple.value.toString();
-                  let parsedNumber = PhoneNumberUtils.parse(number);
-
-                  cursor.value.search.exactTel = [number];
-                  if (parsedNumber &&
-                      parsedNumber.internationalNumber &&
-                      number !== parsedNumber.internationalNumber) {
-                    cursor.value.search.exactTel.push(parsedNumber.internationalNumber);
-                  }
-                }
-              )
-              cursor.update(cursor.value);
-            }
-            if (DEBUG) debug("upgrade : " + JSON.stringify(cursor.value));
-            cursor.continue();
-          } else {
-            next();
-          }
-        };
-      },
-      function upgrade6to7() {
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-        let names = objectStore.indexNames;
-        let whiteList = ["tel", "familyName", "givenName",  "familyNameLowerCase",
-                         "givenNameLowerCase", "telLowerCase", "category", "email",
-                         "emailLowerCase"];
-        for (var i = 0; i < names.length; i++) {
-          if (whiteList.indexOf(names[i]) < 0) {
-            objectStore.deleteIndex(names[i]);
-          }
-        }
-        next();
-      },
-      function upgrade7to8() {
-        if (DEBUG) debug("Adding object store for cached searches");
-        db.createObjectStore(SAVED_GETALL_STORE_NAME);
-        next();
-      },
-      function upgrade8to9() {
-        if (DEBUG) debug("Make exactTel only contain the value entered by the user");
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (cursor.value.properties.tel) {
-              cursor.value.search.exactTel = [];
-              cursor.value.properties.tel.forEach(
-                function(tel) {
-                  let normalized = PhoneNumberUtils.normalize(tel.value.toString());
-                  cursor.value.search.exactTel.push(normalized);
-                }
-              );
-              cursor.update(cursor.value);
-            }
-            cursor.continue();
-          } else {
-            next();
-          }
-        };
-      },
-      function upgrade9to10() {
-        // no-op, see https://bugzilla.mozilla.org/show_bug.cgi?id=883770#c16
-        next();
-      },
-      function upgrade10to11() {
-        if (DEBUG) debug("Adding object store for database revision");
-        db.createObjectStore(REVISION_STORE).put(0, REVISION_KEY);
-        next();
-      },
-      function upgrade11to12() {
-        if (DEBUG) debug("Add a telMatch index with national and international numbers");
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-        if (!objectStore.indexNames.contains("telMatch")) {
-          objectStore.createIndex("telMatch", "search.parsedTel", {multiEntry: true});
-        }
-        objectStore.openCursor().onsuccess = function(event) {
-          let cursor = event.target.result;
-          if (cursor) {
-            if (cursor.value.properties.tel) {
-              cursor.value.search.parsedTel = [];
-              cursor.value.properties.tel.forEach(
-                function(tel) {
-                  let parsed = PhoneNumberUtils.parse(tel.value.toString());
-                  if (parsed) {
-                    cursor.value.search.parsedTel.push(parsed.nationalNumber);
-                    cursor.value.search.parsedTel.push(PhoneNumberUtils.normalize(parsed.nationalFormat));
-                    cursor.value.search.parsedTel.push(parsed.internationalNumber);
-                    cursor.value.search.parsedTel.push(PhoneNumberUtils.normalize(parsed.internationalFormat));
-                  }
-                  cursor.value.search.parsedTel.push(PhoneNumberUtils.normalize(tel.value.toString()));
-                }
-              );
-              cursor.update(cursor.value);
-            }
-            cursor.continue();
-          } else {
-            next();
-          }
-        };
-      },
-      function upgrade12to13() {
-        if (DEBUG) debug("Add phone substring to the search index if appropriate for country");
-        if (this.substringMatching) {
-          scheduleValueUpgrade(function upgradeValue12to13(value) {
-            if (value.properties.tel) {
-              value.search.parsedTel = value.search.parsedTel || [];
-              value.properties.tel.forEach(
-                function(tel) {
-                  let normalized = PhoneNumberUtils.normalize(tel.value.toString());
-                  if (normalized) {
-                    if (this.substringMatching && normalized.length > this.substringMatching) {
-                      let sub = normalized.slice(-this.substringMatching);
-                      if (value.search.parsedTel.indexOf(sub) === -1) {
-                        if (DEBUG) debug("Adding substring index: " + tel + ", " + sub);
-                        value.search.parsedTel.push(sub);
-                      }
-                    }
-                  }
-                }.bind(this)
-              );
-              return true;
-            } else {
-              return false;
-            }
-          }.bind(this));
-        }
-        next();
-      },
-      function upgrade13to14() {
-        if (DEBUG) debug("Cleaning up empty substring entries in telMatch index");
-        scheduleValueUpgrade(function upgradeValue13to14(value) {
-          function removeEmptyStrings(value) {
-            if (value) {
-              const oldLength = value.length;
-              for (let i = 0; i < value.length; ++i) {
-                if (!value[i] || value[i] == "null") {
-                  value.splice(i, 1);
-                }
-              }
-              return oldLength !== value.length;
-            }
-          }
-
-          let modified = removeEmptyStrings(value.search.parsedTel);
-          let modified2 = removeEmptyStrings(value.search.tel);
-          return (modified || modified2);
-        });
-
-        next();
-      },
-      function upgrade14to15() {
-        if (DEBUG) debug("Fix array properties saved as scalars");
-        const ARRAY_PROPERTIES = ["photo", "adr", "email", "url", "impp", "tel",
-                                 "name", "honorificPrefix", "givenName",
-                                 "additionalName", "familyName", "honorificSuffix",
-                                 "nickname", "category", "org", "jobTitle",
-                                 "note", "key"];
-        const PROPERTIES_WITH_TYPE = ["adr", "email", "url", "impp", "tel"];
-
-        scheduleValueUpgrade(function upgradeValue14to15(value) {
-          let changed = false;
-
-          let props = value.properties;
-          for (let prop of ARRAY_PROPERTIES) {
-            if (props[prop]) {
-              if (!Array.isArray(props[prop])) {
-                value.properties[prop] = [props[prop]];
-                changed = true;
-              }
-              if (PROPERTIES_WITH_TYPE.indexOf(prop) !== -1) {
-                let subprop = value.properties[prop];
-                for (let i = 0; i < subprop.length; ++i) {
-                  if (!Array.isArray(subprop[i].type)) {
-                    value.properties[prop][i].type = [subprop[i].type];
-                    changed = true;
-                  }
-                }
-              }
-            }
-          }
-
-          return changed;
-        });
-
-        next();
-      },
-      function upgrade15to16() {
-        if (DEBUG) debug("Fix Date properties");
-        const DATE_PROPERTIES = ["bday", "anniversary"];
-
-        scheduleValueUpgrade(function upgradeValue15to16(value) {
-          let changed = false;
-          let props = value.properties;
-          for (let prop of DATE_PROPERTIES) {
-            if (props[prop] && !(props[prop] instanceof Date)) {
-              value.properties[prop] = new Date(props[prop]);
-              changed = true;
-            }
-          }
-
-          return changed;
-        });
-
-        next();
-      },
-      function upgrade16to17() {
-        if (DEBUG) debug("Fix array with null values");
-        const ARRAY_PROPERTIES = ["photo", "adr", "email", "url", "impp", "tel",
-                                 "name", "honorificPrefix", "givenName",
-                                 "additionalName", "familyName", "honorificSuffix",
-                                 "nickname", "category", "org", "jobTitle",
-                                 "note", "key"];
-
-        const PROPERTIES_WITH_TYPE = ["adr", "email", "url", "impp", "tel"];
-
-        const DATE_PROPERTIES = ["bday", "anniversary"];
-
-        scheduleValueUpgrade(function upgradeValue16to17(value) {
-          let changed;
-
-          function filterInvalidValues(val) {
-            let shouldKeep = val != null; // null or undefined
-            if (!shouldKeep) {
-              changed = true;
-            }
-            return shouldKeep;
-          }
-
-          function filteredArray(array) {
-            return array.filter(filterInvalidValues);
-          }
-
-          let props = value.properties;
-
-          for (let prop of ARRAY_PROPERTIES) {
-
-            // properties that were empty strings weren't converted to arrays
-            // in upgrade14to15
-            if (props[prop] != null && !Array.isArray(props[prop])) {
-              props[prop] = [props[prop]];
-              changed = true;
-            }
-
-            if (props[prop] && props[prop].length) {
-              props[prop] = filteredArray(props[prop]);
-
-              if (PROPERTIES_WITH_TYPE.indexOf(prop) !== -1) {
-                let subprop = props[prop];
-
-                for (let i = 0; i < subprop.length; ++i) {
-                  let curSubprop = subprop[i];
-                  // upgrade14to15 transformed type props into an array
-                  // without checking invalid values
-                  if (curSubprop.type) {
-                    curSubprop.type = filteredArray(curSubprop.type);
-                  }
-                }
-              }
-            }
-          }
-
-          for (let prop of DATE_PROPERTIES) {
-            if (props[prop] != null && !(props[prop] instanceof Date)) {
-              // props[prop] is probably '' and wasn't converted
-              // in upgrade15to16
-              props[prop] = null;
-              changed = true;
-            }
-          }
-
-          if (changed) {
-            value.properties = props;
-            return true;
-          } else {
-            return false;
-          }
-        });
-
-        next();
-      },
-      function upgrade17to18() {
-        // this upgrade function has been moved to the next upgrade path because
-        // a previous version of it had a bug
-        next();
-      },
-      function upgrade18to19() {
-        if (DEBUG) {
-          debug("Adding the name index");
-        }
-
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-
-        // an earlier version of this code could have run, so checking whether
-        // the index exists
-        if (!objectStore.indexNames.contains("name")) {
-          objectStore.createIndex("name", "properties.name", { multiEntry: true });
-          objectStore.createIndex("nameLowerCase", "search.name", { multiEntry: true });
-        }
-
-        scheduleValueUpgrade(function upgradeValue18to19(value) {
-          value.search.name = [];
-          if (value.properties.name) {
-            value.properties.name.forEach(function addNameIndex(name) {
-              var lowerName = name.toLowerCase();
-              // an earlier version of this code could have added it already
-              if (value.search.name.indexOf(lowerName) === -1) {
-                value.search.name.push(lowerName);
-              }
-            });
-          }
-          return true;
-        });
-
-        next();
-      },
-      function upgrade19to20() {
-        if (DEBUG) debug("upgrade19to20 create schema(phonetic)");
-        if (!objectStore) {
-          objectStore = aTransaction.objectStore(STORE_NAME);
-        }
-        objectStore.createIndex("phoneticFamilyName", "properties.phoneticFamilyName", { multiEntry: true });
-        objectStore.createIndex("phoneticGivenName", "properties.phoneticGivenName", { multiEntry: true });
-        objectStore.createIndex("phoneticFamilyNameLowerCase", "search.phoneticFamilyName", { multiEntry: true });
-        objectStore.createIndex("phoneticGivenNameLowerCase",  "search.phoneticGivenName",  { multiEntry: true });
-        next();
-      },
-    ];
-
-    let index = aOldVersion;
-    let outer = this;
-
-    /* This function runs all upgrade functions that are in the
-     * valueUpgradeSteps array. These functions have the following properties:
-     * - they must be synchronous
-     * - they must take the value as parameter and modify it directly. They
-     *   must not create a new object.
-     * - they must return a boolean true/false; true if the value was actually
-     *   changed
-     */
-    function runValueUpgradeSteps(done) {
-      if (DEBUG) debug("Running the value upgrade functions.");
-      if (!objectStore) {
-        objectStore = aTransaction.objectStore(STORE_NAME);
-      }
-      objectStore.openCursor().onsuccess = function(event) {
-        let cursor = event.target.result;
-        if (cursor) {
-          let changed = false;
-          let oldValue;
-          let value = cursor.value;
-          if (DEBUG) {
-            oldValue = JSON.stringify(value);
-          }
-          valueUpgradeSteps.forEach(function(upgradeFunc, i) {
-            if (DEBUG) debug("Running upgrade function " + i);
-            changed = upgradeFunc(value) || changed;
-          });
-
-          if (changed) {
-            cursor.update(value);
-          } else if (DEBUG) {
-            let newValue = JSON.stringify(value);
-            if (newValue !== oldValue) {
-              // oops something went wrong
-              debug("upgrade: `changed` was false and still the value changed! Aborting.");
-              aTransaction.abort();
-              return;
-            }
-          }
-          cursor.continue();
-        } else {
-          done();
-        }
-      };
-    }
-
-    function finish() {
-      // We always output this debug line because it's useful and the noise ratio
-      // very low.
-      debug("Upgrade finished");
-
-      outer.incrementRevision(aTransaction);
-    }
-
-    function next() {
-      if (index == aNewVersion) {
-        runValueUpgradeSteps(finish);
-        return;
-      }
-
-      try {
-        var i = index++;
-        if (DEBUG) debug("Upgrade step: " + i + "\n");
-        steps[i].call(outer);
-      } catch(ex) {
-        dump("Caught exception" + ex);
-        aTransaction.abort();
-        return;
-      }
-    }
-
-    function fail(why) {
-      why = why || "";
-      if (this.error) {
-        why += " (root cause: " + this.error.name + ")";
-      }
-
-      debug("Contacts DB upgrade error: " + why);
-      aTransaction.abort();
-    }
-
-    if (aNewVersion > steps.length) {
-      fail("No migration steps for the new version!");
-    }
-
-    this.cpuLock = Cc["@mozilla.org/power/powermanagerservice;1"]
-                     .getService(Ci.nsIPowerManagerService)
-                     .newWakeLock("cpu");
-
-    function unlockCPU() {
-      if (outer.cpuLock) {
-        if (DEBUG) debug("unlocking cpu wakelock");
-        outer.cpuLock.unlock();
-        outer.cpuLock = null;
-      }
-    }
-
-    aTransaction.addEventListener("complete", unlockCPU);
-    aTransaction.addEventListener("abort", unlockCPU);
-
-    next();
-  },
-
-  makeImport: function makeImport(aContact) {
-    let contact = {properties: {}};
-
-    contact.search = {
-      name:            [],
-      givenName:       [],
-      familyName:      [],
-      email:           [],
-      category:        [],
-      tel:             [],
-      exactTel:        [],
-      parsedTel:       [],
-      phoneticFamilyName:   [],
-      phoneticGivenName:    [],
-    };
-
-    for (let field in aContact.properties) {
-      contact.properties[field] = aContact.properties[field];
-      // Add search fields
-      if (aContact.properties[field] && contact.search[field]) {
-        for (let i = 0; i <= aContact.properties[field].length; i++) {
-          if (aContact.properties[field][i]) {
-            if (field == "tel" && aContact.properties[field][i].value) {
-              let number = aContact.properties.tel[i].value.toString();
-              let normalized = PhoneNumberUtils.normalize(number);
-              // We use an object here to avoid duplicates
-              let containsSearch = {};
-              let matchSearch = {};
-
-              if (normalized) {
-                // exactTel holds normalized version of entered phone number.
-                // normalized: +1 (949) 123 - 4567 -> +19491234567
-                contact.search.exactTel.push(normalized);
-                // matchSearch holds normalized version of entered phone number,
-                // nationalNumber, nationalFormat, internationalNumber, internationalFormat
-                matchSearch[normalized] = 1;
-                let parsedNumber = PhoneNumberUtils.parse(number);
-                if (parsedNumber) {
-                  if (DEBUG) {
-                    debug("InternationalFormat: " + parsedNumber.internationalFormat);
-                    debug("InternationalNumber: " + parsedNumber.internationalNumber);
-                    debug("NationalNumber: " + parsedNumber.nationalNumber);
-                    debug("NationalFormat: " + parsedNumber.nationalFormat);
-                    debug("NationalMatchingFormat: " + parsedNumber.nationalMatchingFormat);
-                  }
-                  matchSearch[parsedNumber.nationalNumber] = 1;
-                  matchSearch[parsedNumber.internationalNumber] = 1;
-                  matchSearch[PhoneNumberUtils.normalize(parsedNumber.nationalFormat)] = 1;
-                  matchSearch[PhoneNumberUtils.normalize(parsedNumber.internationalFormat)] = 1;
-                  matchSearch[PhoneNumberUtils.normalize(parsedNumber.nationalMatchingFormat)] = 1;
-                } else if (this.substringMatching && normalized.length > this.substringMatching) {
-                  matchSearch[normalized.slice(-this.substringMatching)] = 1;
-                }
-
-                // containsSearch holds incremental search values for:
-                // normalized number and national format
-                for (let i = 0; i < normalized.length; i++) {
-                  containsSearch[normalized.substring(i, normalized.length)] = 1;
-                }
-                if (parsedNumber && parsedNumber.nationalFormat) {
-                  let number = PhoneNumberUtils.normalize(parsedNumber.nationalFormat);
-                  for (let i = 0; i < number.length; i++) {
-                    containsSearch[number.substring(i, number.length)] = 1;
-                  }
-                }
-              }
-              for (let num in containsSearch) {
-                if (num && num != "null") {
-                  contact.search.tel.push(num);
-                }
-              }
-              for (let num in matchSearch) {
-                if (num && num != "null") {
-                  contact.search.parsedTel.push(num);
-                }
-              }
-            } else if ((field == "impp" || field == "email") && aContact.properties[field][i].value) {
-              let value = aContact.properties[field][i].value;
-              if (value && typeof value == "string") {
-                contact.search[field].push(value.toLowerCase());
-              }
-            } else {
-              let val = aContact.properties[field][i];
-              if (typeof val == "string") {
-                contact.search[field].push(val.toLowerCase());
-              }
-            }
-          }
-        }
-      }
-    }
-
-    contact.updated = aContact.updated;
-    contact.published = aContact.published;
-    contact.id = aContact.id;
-
-    return contact;
-  },
-
-  updateRecordMetadata: function updateRecordMetadata(record) {
-    if (!record.id) {
-      Cu.reportError("Contact without ID");
-    }
-    if (!record.published) {
-      record.published = new Date();
-    }
-    record.updated = new Date();
-  },
-
-  removeObjectFromCache: function CDB_removeObjectFromCache(aObjectId, aCallback, aFailureCb) {
-    if (DEBUG) debug("removeObjectFromCache: " + aObjectId);
-    if (!aObjectId) {
-      if (DEBUG) debug("No object ID passed");
-      return;
-    }
-    this.newTxn("readwrite", this.dbStoreNames, function(txn, stores) {
-      let store = txn.objectStore(SAVED_GETALL_STORE_NAME);
-      store.openCursor().onsuccess = function(e) {
-        let cursor = e.target.result;
-        if (cursor) {
-          for (let i = 0; i < cursor.value.length; ++i) {
-            if (cursor.value[i] == aObjectId) {
-              if (DEBUG) debug("id matches cache");
-              cursor.value.splice(i, 1);
-              cursor.update(cursor.value);
-              break;
-            }
-          }
-          cursor.continue();
-        } else {
-          aCallback(txn);
-        }
-      }.bind(this);
-    }.bind(this), null, aFailureCb);
-  },
-
-  incrementRevision: function CDB_incrementRevision(txn) {
-    let revStore = txn.objectStore(REVISION_STORE);
-    revStore.get(REVISION_KEY).onsuccess = function(e) {
-      revStore.put(parseInt(e.target.result, 10) + 1, REVISION_KEY);
-    };
-  },
-
-  saveContact: function CDB_saveContact(aContact, successCb, errorCb) {
-    let contact = this.makeImport(aContact);
-    this.newTxn("readwrite", this.dbStoreNames, function (txn, stores) {
-      if (DEBUG) debug("Going to update" + JSON.stringify(contact));
-      let store = txn.objectStore(STORE_NAME);
-
-      // Look up the existing record and compare the update timestamp.
-      // If no record exists, just add the new entry.
-      let newRequest = store.get(contact.id);
-      newRequest.onsuccess = function (event) {
-        if (!event.target.result) {
-          if (DEBUG) debug("new record!")
-          this.updateRecordMetadata(contact);
-          store.put(contact);
-        } else {
-          if (DEBUG) debug("old record!")
-          if (new Date(typeof contact.updated === "undefined" ? 0 : contact.updated) < new Date(event.target.result.updated)) {
-            if (DEBUG) debug("rev check fail!");
-            txn.abort();
-            return;
-          } else {
-            if (DEBUG) debug("rev check OK");
-            contact.published = event.target.result.published;
-            contact.updated = new Date();
-            store.put(contact);
-          }
-        }
-        // Invalidate the entire cache. It will be incrementally regenerated on demand
-        // See getCacheForQuery
-        let getAllStore = txn.objectStore(SAVED_GETALL_STORE_NAME);
-        getAllStore.clear().onerror = errorCb;
-      }.bind(this);
-
-      this.incrementRevision(txn);
-    }.bind(this), successCb, errorCb);
-  },
-
-  removeContact: function removeContact(aId, aSuccessCb, aErrorCb) {
-    if (DEBUG) debug("removeContact: " + aId);
-    this.removeObjectFromCache(aId, function(txn) {
-      let store = txn.objectStore(STORE_NAME)
-      store.delete(aId).onsuccess = function() {
-        aSuccessCb();
-      };
-      this.incrementRevision(txn);
-    }.bind(this), aErrorCb);
-  },
-
-  clear: function clear(aSuccessCb, aErrorCb) {
-    this.newTxn("readwrite", STORE_NAME, function (txn, store) {
-      if (DEBUG) debug("Going to clear all!");
-      store.clear();
-      this.incrementRevision(txn);
-    }.bind(this), aSuccessCb, aErrorCb);
-  },
-
-  createCacheForQuery: function CDB_createCacheForQuery(aQuery, aSuccessCb, aFailureCb) {
-    this.find(function (aContacts) {
-      if (aContacts) {
-        let contactsArray = [];
-        for (let i in aContacts) {
-          contactsArray.push(aContacts[i]);
-        }
-
-        let contactIdsArray = contactsArray.map(el => el.id);
-
-        // save contact ids in cache
-        this.newTxn("readwrite", SAVED_GETALL_STORE_NAME, function(txn, store) {
-          store.put(contactIdsArray, aQuery);
-        }, null, aFailureCb);
-
-        // send full contacts
-        aSuccessCb(contactsArray, true);
-      } else {
-        aSuccessCb([], true);
-      }
-    }.bind(this),
-    function (aErrorMsg) { aFailureCb(aErrorMsg); },
-    JSON.parse(aQuery));
-  },
-
-  getCacheForQuery: function CDB_getCacheForQuery(aQuery, aSuccessCb, aFailureCb) {
-    if (DEBUG) debug("getCacheForQuery");
-    // Here we try to get the cached results for query `aQuery'. If they don't
-    // exist, it means the cache was invalidated and needs to be recreated, so
-    // we do that. Otherwise, we just return the existing cache.
-    this.newTxn("readonly", SAVED_GETALL_STORE_NAME, function(txn, store) {
-      let req = store.get(aQuery);
-      req.onsuccess = function(e) {
-        if (e.target.result) {
-          if (DEBUG) debug("cache exists");
-          aSuccessCb(e.target.result, false);
-        } else {
-          if (DEBUG) debug("creating cache for query " + aQuery);
-          this.createCacheForQuery(aQuery, aSuccessCb);
-        }
-      }.bind(this);
-      req.onerror = function(e) {
-        aFailureCb(e.target.errorMessage);
-      };
-    }.bind(this), null, aFailureCb);
-  },
-
-  sendNow: function CDB_sendNow(aCursorId) {
-    if (aCursorId in this._dispatcher) {
-      this._dispatcher[aCursorId].sendNow();
-    }
-  },
-
-  clearDispatcher: function CDB_clearDispatcher(aCursorId) {
-    if (DEBUG) debug("clearDispatcher: " + aCursorId);
-    if (aCursorId in this._dispatcher) {
-      delete this._dispatcher[aCursorId];
-    }
-  },
-
-  getAll: function CDB_getAll(aSuccessCb, aFailureCb, aOptions, aCursorId) {
-    if (DEBUG) debug("getAll")
-    let optionStr = JSON.stringify(aOptions);
-    this.getCacheForQuery(optionStr, function(aCachedResults, aFullContacts) {
-      // aFullContacts is true if the cache didn't exist and had to be created.
-      // In that case, we receive the full contacts since we already have them
-      // in memory to create the cache. This allows us to avoid accessing the
-      // object store again.
-      if (aCachedResults && aCachedResults.length > 0) {
-        let newTxnFn = this.newTxn.bind(this);
-        let clearDispatcherFn = this.clearDispatcher.bind(this, aCursorId);
-        this._dispatcher[aCursorId] = new ContactDispatcher(aCachedResults, aFullContacts,
-                                                            aSuccessCb, newTxnFn,
-                                                            clearDispatcherFn, aFailureCb);
-        this._dispatcher[aCursorId].sendNow();
-      } else { // no contacts
-        if (DEBUG) debug("query returned no contacts");
-        aSuccessCb(null);
-      }
-    }.bind(this), aFailureCb);
-  },
-
-  getRevision: function CDB_getRevision(aSuccessCb, aErrorCb) {
-    if (DEBUG) debug("getRevision");
-    this.newTxn("readonly", REVISION_STORE, function (txn, store) {
-      store.get(REVISION_KEY).onsuccess = function (e) {
-        aSuccessCb(e.target.result);
-      };
-    },null, aErrorCb);
-  },
-
-  getCount: function CDB_getCount(aSuccessCb, aErrorCb) {
-    if (DEBUG) debug("getCount");
-    this.newTxn("readonly", STORE_NAME, function (txn, store) {
-      store.count().onsuccess = function (e) {
-        aSuccessCb(e.target.result);
-      };
-    }, null, aErrorCb);
-  },
-
-  getSortByParam: function CDB_getSortByParam(aFindOptions) {
-    switch (aFindOptions.sortBy) {
-      case "familyName":
-        return [ "familyName", "givenName" ];
-      case "givenName":
-        return [ "givenName" , "familyName" ];
-      case "phoneticFamilyName":
-        return [ "phoneticFamilyName" , "phoneticGivenName" ];
-      case "phoneticGivenName":
-        return [ "phoneticGivenName" , "phoneticFamilyName" ];
-      default:
-        return [ "givenName" , "familyName" ];
-    }
-  },
-
-  /*
-   * Sorting the contacts by sortBy field. aSortBy can either be familyName or givenName.
-   * If 2 entries have the same sortyBy field or no sortBy field is present, we continue
-   * sorting with the other sortyBy field.
-   */
-  sortResults: function CDB_sortResults(aResults, aFindOptions) {
-    if (!aFindOptions)
-      return;
-    if (aFindOptions.sortBy != "undefined") {
-      const sortOrder = aFindOptions.sortOrder;
-      const sortBy = this.getSortByParam(aFindOptions);
-
-      aResults.sort(function (a, b) {
-        let x, y;
-        let result = 0;
-        let xIndex = 0;
-        let yIndex = 0;
-
-        do {
-          while (xIndex < sortBy.length && !x) {
-            x = a.properties[sortBy[xIndex]];
-            if (x) {
-              x = x.join("").toLowerCase();
-            }
-            xIndex++;
-          }
-          while (yIndex < sortBy.length && !y) {
-            y = b.properties[sortBy[yIndex]];
-            if (y) {
-              y = y.join("").toLowerCase();
-            }
-            yIndex++;
-          }
-          if (!x) {
-            if (!y) {
-              let px, py;
-              px = JSON.stringify(a.published);
-              py = JSON.stringify(b.published);
-              if (px && py) {
-                return px.localeCompare(py);
-              }
-            } else {
-              return sortOrder == 'descending' ? 1 : -1;
-            }
-          }
-          if (!y) {
-            return sortOrder == "ascending" ? 1 : -1;
-          }
-
-          result = x.localeCompare(y);
-          x = null;
-          y = null;
-        } while (result == 0);
-
-        return sortOrder == "ascending" ? result : -result;
-      });
-    }
-    if (aFindOptions.filterLimit && aFindOptions.filterLimit != 0) {
-      if (DEBUG) debug("filterLimit is set: " + aFindOptions.filterLimit);
-      aResults.splice(aFindOptions.filterLimit, aResults.length);
-    }
-  },
-
-  /**
-   * @param successCb
-   *        Callback function to invoke with result array.
-   * @param failureCb [optional]
-   *        Callback function to invoke when there was an error.
-   * @param options [optional]
-   *        Object specifying search options. Possible attributes:
-   *        - filterBy
-   *        - filterOp
-   *        - filterValue
-   *        - count
-   */
-  find: function find(aSuccessCb, aFailureCb, aOptions) {
-    if (DEBUG) debug("ContactDB:find val:" + aOptions.filterValue + " by: " + aOptions.filterBy + " op: " + aOptions.filterOp);
-    let self = this;
-    this.newTxn("readonly", STORE_NAME, function (txn, store) {
-      let filterOps = ["equals", "contains", "match", "startsWith"];
-      if (aOptions && (filterOps.indexOf(aOptions.filterOp) >= 0)) {
-        self._findWithIndex(txn, store, aOptions);
-      } else {
-        self._findAll(txn, store, aOptions);
-      }
-    }, aSuccessCb, aFailureCb);
-  },
-
-  _findWithIndex: function _findWithIndex(txn, store, options) {
-    if (DEBUG) debug("_findWithIndex: " + options.filterValue +" " + options.filterOp + " " + options.filterBy + " ");
-    let fields = options.filterBy;
-    for (let key in fields) {
-      if (DEBUG) debug("key: " + fields[key]);
-      if (!store.indexNames.contains(fields[key]) && fields[key] != "id") {
-        if (DEBUG) debug("Key not valid!" + fields[key] + ", " + JSON.stringify(store.indexNames));
-        txn.abort();
-        return;
-      }
-    }
-
-    // lookup for all keys
-    if (options.filterBy.length == 0) {
-      if (DEBUG) debug("search in all fields!" + JSON.stringify(store.indexNames));
-      for(let myIndex = 0; myIndex < store.indexNames.length; myIndex++) {
-        fields = Array.concat(fields, store.indexNames[myIndex])
-      }
-    }
-
-    // Sorting functions takes care of limit if set.
-    let limit = options.sortBy === 'undefined' ? options.filterLimit : null;
-
-    let filter_keys = fields.slice();
-    for (let key = filter_keys.shift(); key; key = filter_keys.shift()) {
-      let request;
-      let substringResult = {};
-      if (key == "id") {
-        // store.get would return an object and not an array
-        request = store.mozGetAll(options.filterValue);
-      } else if (key == "category") {
-        let index = store.index(key);
-        request = index.mozGetAll(options.filterValue, limit);
-      } else if (options.filterOp == "equals") {
-        if (DEBUG) debug("Getting index: " + key);
-        // case sensitive
-        let index = store.index(key);
-        let filterValue = options.filterValue;
-        if (key == "tel") {
-          filterValue = PhoneNumberUtils.normalize(filterValue,
-                                                   /*numbersOnly*/ true);
-        }
-        request = index.mozGetAll(filterValue, limit);
-      } else if (options.filterOp == "match") {
-        if (DEBUG) debug("match");
-        if (key != "tel") {
-          dump("ContactDB: 'match' filterOp only works on tel\n");
-          return txn.abort();
-        }
-
-        let index = store.index("telMatch");
-        let normalized = PhoneNumberUtils.normalize(options.filterValue,
-                                                    /*numbersOnly*/ true);
-
-        if (!normalized.length) {
-          dump("ContactDB: normalized filterValue is empty, can't perform match search.\n");
-          return txn.abort();
-        }
-
-        // Some countries need special handling for number matching. Bug 877302
-        if (this.substringMatching && normalized.length > this.substringMatching) {
-          let substring = normalized.slice(-this.substringMatching);
-          if (DEBUG) debug("Substring: " + substring);
-
-          let substringRequest = index.mozGetAll(substring, limit);
-
-          substringRequest.onsuccess = function (event) {
-            if (DEBUG) debug("Request successful. Record count: " + event.target.result.length);
-            for (let i in event.target.result) {
-              substringResult[event.target.result[i].id] = event.target.result[i];
-            }
-          }.bind(this);
-        } else if (normalized[0] !== "+") {
-          // We might have an international prefix like '00'
-          let parsed = PhoneNumberUtils.parse(normalized);
-          if (parsed && parsed.internationalNumber &&
-              parsed.nationalNumber  &&
-              parsed.nationalNumber !== normalized &&
-              parsed.internationalNumber !== normalized) {
-            if (DEBUG) debug("Search with " + parsed.internationalNumber);
-            let prefixRequest = index.mozGetAll(parsed.internationalNumber, limit);
-
-            prefixRequest.onsuccess = function (event) {
-              if (DEBUG) debug("Request successful. Record count: " + event.target.result.length);
-              for (let i in event.target.result) {
-                substringResult[event.target.result[i].id] = event.target.result[i];
-              }
-            }.bind(this);
-          }
-        }
-
-        request = index.mozGetAll(normalized, limit);
-      } else {
-        // XXX: "contains" should be handled separately, this is "startsWith"
-        if (options.filterOp === 'contains' && key !== 'tel') {
-          dump("ContactDB: 'contains' only works for 'tel'. Falling back " +
-               "to 'startsWith'.\n");
-        }
-        // not case sensitive
-        let lowerCase = options.filterValue.toString().toLowerCase();
-        if (key === "tel") {
-          let origLength = lowerCase.length;
-          let tmp = PhoneNumberUtils.normalize(lowerCase, /*numbersOnly*/ true);
-          if (tmp.length != origLength) {
-            let NON_SEARCHABLE_CHARS = /[^#+\*\d\s()-]/;
-            // e.g. number "123". find with "(123)" but not with "123a"
-            if (tmp === "" || NON_SEARCHABLE_CHARS.test(lowerCase)) {
-              if (DEBUG) debug("Call continue!");
-              continue;
-            }
-            lowerCase = tmp;
-          }
-        }
-        if (DEBUG) debug("lowerCase: " + lowerCase);
-        let range = IDBKeyRange.bound(lowerCase, lowerCase + "\uFFFF");
-        let index = store.index(key + "LowerCase");
-        request = index.mozGetAll(range, limit);
-      }
-      if (!txn.result)
-        txn.result = {};
-
-      request.onsuccess = function (event) {
-        if (DEBUG) debug("Request successful. Record count: " + event.target.result.length);
-        if (Object.keys(substringResult).length > 0) {
-          for (let attrname in substringResult) {
-            event.target.result[attrname] = substringResult[attrname];
-          }
-        }
-        this.sortResults(event.target.result, options);
-        for (let i in event.target.result)
-          txn.result[event.target.result[i].id] = exportContact(event.target.result[i]);
-      }.bind(this);
-    }
-  },
-
-  _findAll: function _findAll(txn, store, options) {
-    if (DEBUG) debug("ContactDB:_findAll:  " + JSON.stringify(options));
-    if (!txn.result)
-      txn.result = {};
-    // Sorting functions takes care of limit if set.
-    let limit = options.sortBy === 'undefined' ? options.filterLimit : null;
-    store.mozGetAll(null, limit).onsuccess = function (event) {
-      if (DEBUG) debug("Request successful. Record count:" + event.target.result.length);
-      this.sortResults(event.target.result, options);
-      for (let i in event.target.result) {
-        txn.result[event.target.result[i].id] = exportContact(event.target.result[i]);
-      }
-    }.bind(this);
-  },
-
-  // Enable special phone number substring matching. Does not update existing DB entries.
-  enableSubstringMatching: function enableSubstringMatching(aDigits) {
-    if (DEBUG) debug("MCC enabling substring matching " + aDigits);
-    this.substringMatching = aDigits;
-  },
-
-  disableSubstringMatching: function disableSubstringMatching() {
-    if (DEBUG) debug("MCC disabling substring matching");
-    delete this.substringMatching;
-  },
-
-  init: function init() {
-    this.initDBHelper(DB_NAME, DB_VERSION, [STORE_NAME, SAVED_GETALL_STORE_NAME, REVISION_STORE]);
-  }
-};

deleted file mode 100644
--- a/dom/contacts/fallback/ContactService.jsm
+++ /dev/null
@@ -1,266 +0,0 @@
-/* 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/. */
-
-"use strict";
-
-const DEBUG = false;
-function debug(s) { dump("-*- Fallback ContactService component: " + s + "\n"); }
-
-const Cu = Components.utils;
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-this.EXPORTED_SYMBOLS = ["ContactService"];
-
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-Cu.import("resource://gre/modules/Services.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "ContactDB",
-                                  "resource://gre/modules/ContactDB.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "PhoneNumberUtils",
-                                  "resource://gre/modules/PhoneNumberUtils.jsm");
-
-XPCOMUtils.defineLazyServiceGetter(this, "ppmm",
-                                   "@mozilla.org/parentprocessmessagemanager;1",
-                                   "nsIMessageListenerManager");
-
-
-/* all exported symbols need to be bound to this on B2G - Bug 961777 */
-var ContactService = this.ContactService = {
-  init: function() {
-    if (DEBUG) debug("Init");
-    this._messages = ["Contacts:Find", "Contacts:GetAll", "Contacts:GetAll:SendNow",
-                      "Contacts:Clear", "Contact:Save",
-                      "Contact:Remove", "Contacts:RegisterForMessages",
-                      "child-process-shutdown", "Contacts:GetRevision",
-                      "Contacts:GetCount"];
-    this._children = [];
-    this._cursors = new Map();
-    this._messages.forEach(function(msgName) {
-      ppmm.addMessageListener(msgName, this);
-    }.bind(this));
-
-    this._db = new ContactDB();
-    this._db.init();
-
-    this.configureSubstringMatching();
-
-    Services.obs.addObserver(this, "profile-before-change", false);
-    Services.prefs.addObserver("ril.lastKnownSimMcc", this, false);
-  },
-
-  observe: function(aSubject, aTopic, aData) {
-    if (aTopic === 'profile-before-change') {
-      this._messages.forEach(function(msgName) {
-        ppmm.removeMessageListener(msgName, this);
-      }.bind(this));
-      Services.obs.removeObserver(this, "profile-before-change");
-      Services.prefs.removeObserver("dom.phonenumber.substringmatching", this);
-      ppmm = null;
-      this._messages = null;
-      if (this._db)
-        this._db.close();
-      this._db = null;
-      this._children = null;
-      this._cursors = null;
-    } else if (aTopic === 'nsPref:changed' && aData === "ril.lastKnownSimMcc") {
-      this.configureSubstringMatching();
-    }
-  },
-
-  configureSubstringMatching: function() {
-    let countryName = PhoneNumberUtils.getCountryName();
-    if (Services.prefs.getPrefType("dom.phonenumber.substringmatching." + countryName) == Ci.nsIPrefBranch.PREF_INT) {
-      let val = Services.prefs.getIntPref("dom.phonenumber.substringmatching." + countryName);
-      if (val) {
-        this._db.enableSubstringMatching(val);
-        return;
-      }
-    }
-    // if we got here, we dont have a substring setting
-    // for this country, so disable substring matching
-    this._db.disableSubstringMatching();
-  },
-
-  assertPermission: function(aMessage, aPerm) {
-    if (!aMessage.target.assertPermission(aPerm)) {
-      Cu.reportError("Contacts message " + aMessage.name +
-                     " from a content process with no" + aPerm + " privileges.");
-      return false;
-    }
-    return true;
-  },
-
-  broadcastMessage: function broadcastMessage(aMsgName, aContent) {
-    this._children.forEach(function(msgMgr) {
-      msgMgr.sendAsyncMessage(aMsgName, aContent);
-    });
-  },
-
-  receiveMessage: function(aMessage) {
-    if (DEBUG) debug("receiveMessage " + aMessage.name);
-    let mm = aMessage.target;
-    let msg = aMessage.data;
-    let cursorList;
-
-    switch (aMessage.name) {
-      case "Contacts:Find":
-        if (!this.assertPermission(aMessage, "contacts-read")) {
-          return null;
-        }
-        let result = [];
-        this._db.find(
-          function(contacts) {
-            for (let i in contacts) {
-              result.push(contacts[i]);
-            }
-
-            if (DEBUG) debug("result:" + JSON.stringify(result));
-            mm.sendAsyncMessage("Contacts:Find:Return:OK", {requestID: msg.requestID, contacts: result});
-          }.bind(this),
-          function(aErrorMsg) { mm.sendAsyncMessage("Contacts:Find:Return:KO", { requestID: msg.requestID, errorMsg: aErrorMsg }); }.bind(this),
-          msg.options.findOptions);
-        break;
-      case "Contacts:GetAll":
-        if (!this.assertPermission(aMessage, "contacts-read")) {
-          return null;
-        }
-        cursorList = this._cursors.get(mm);
-        if (!cursorList) {
-          cursorList = [];
-          this._cursors.set(mm, cursorList);
-        }
-        cursorList.push(msg.cursorId);
-
-        this._db.getAll(
-          function(aContacts) {
-            try {
-              mm.sendAsyncMessage("Contacts:GetAll:Next", {cursorId: msg.cursorId, contacts: aContacts});
-              if (aContacts === null) {
-                let cursorList = this._cursors.get(mm);
-                let index = cursorList.indexOf(msg.cursorId);
-                cursorList.splice(index, 1);
-              }
-            } catch (e) {
-              if (DEBUG) debug("Child is dead, DB should stop sending contacts");
-              throw e;
-            }
-          }.bind(this),
-          function(aErrorMsg) { mm.sendAsyncMessage("Contacts:GetAll:Return:KO", { requestID: msg.cursorId, errorMsg: aErrorMsg }); },
-          msg.findOptions, msg.cursorId);
-        break;
-      case "Contacts:GetAll:SendNow":
-        // sendNow is a no op if there isn't an existing cursor in the DB, so we
-        // don't need to assert the permission again.
-        this._db.sendNow(msg.cursorId);
-        break;
-      case "Contact:Save":
-        if (msg.options.reason === "create") {
-          if (!this.assertPermission(aMessage, "contacts-create")) {
-            return null;
-          }
-        } else {
-          if (!this.assertPermission(aMessage, "contacts-write")) {
-            return null;
-          }
-        }
-        this._db.saveContact(
-          msg.options.contact,
-          function() {
-            mm.sendAsyncMessage("Contact:Save:Return:OK", { requestID: msg.requestID, contactID: msg.options.contact.id });
-            this.broadcastMessage("Contact:Changed", { contactID: msg.options.contact.id, reason: msg.options.reason });
-          }.bind(this),
-          function(aErrorMsg) { mm.sendAsyncMessage("Contact:Save:Return:KO", { requestID: msg.requestID, errorMsg: aErrorMsg }); }.bind(this)
-        );
-        break;
-      case "Contact:Remove":
-        if (!this.assertPermission(aMessage, "contacts-write")) {
-          return null;
-        }
-        this._db.removeContact(
-          msg.options.id,
-          function() {
-            mm.sendAsyncMessage("Contact:Remove:Return:OK", { requestID: msg.requestID, contactID: msg.options.id });
-            this.broadcastMessage("Contact:Changed", { contactID: msg.options.id, reason: "remove" });
-          }.bind(this),
-          function(aErrorMsg) { mm.sendAsyncMessage("Contact:Remove:Return:KO", { requestID: msg.requestID, errorMsg: aErrorMsg }); }.bind(this)
-        );
-        break;
-      case "Contacts:Clear":
-        if (!this.assertPermission(aMessage, "contacts-write")) {
-          return null;
-        }
-        this._db.clear(
-          function() {
-            mm.sendAsyncMessage("Contacts:Clear:Return:OK", { requestID: msg.requestID });
-            this.broadcastMessage("Contact:Changed", { reason: "remove" });
-          }.bind(this),
-          function(aErrorMsg) {
-            mm.sendAsyncMessage("Contacts:Clear:Return:KO", { requestID: msg.requestID, errorMsg: aErrorMsg });
-          }.bind(this)
-        );
-        break;
-      case "Contacts:GetRevision":
-        if (!this.assertPermission(aMessage, "contacts-read")) {
-          return null;
-        }
-        this._db.getRevision(
-          function(revision) {
-            mm.sendAsyncMessage("Contacts:Revision", {
-              requestID: msg.requestID,
-              revision: revision
-            });
-          },
-          function(aErrorMsg) {
-            mm.sendAsyncMessage("Contacts:GetRevision:Return:KO", { requestID: msg.requestID, errorMsg: aErrorMsg });
-          }.bind(this)
-        );
-        break;
-      case "Contacts:GetCount":
-        if (!this.assertPermission(aMessage, "contacts-read")) {
-          return null;
-        }
-        this._db.getCount(
-          function(count) {
-            mm.sendAsyncMessage("Contacts:Count", {
-              requestID: msg.requestID,
-              count: count
-            });
-          },
-          function(aErrorMsg) {
-            mm.sendAsyncMessage("Contacts:Count:Return:KO", { requestID: msg.requestID, errorMsg: aErrorMsg });
-          }.bind(this)
-        );
-        break;
-      case "Contacts:RegisterForMessages":
-        if (!aMessage.target.assertPermission("contacts-read")) {
-          return null;
-        }
-        if (DEBUG) debug("Register!");
-        if (this._children.indexOf(mm) == -1) {
-          this._children.push(mm);
-        }
-        break;
-      case "child-process-shutdown":
-        if (DEBUG) debug("Unregister");
-        let index = this._children.indexOf(mm);
-        if (index != -1) {
-          if (DEBUG) debug("Unregister index: " + index);
-          this._children.splice(index, 1);
-        }
-        cursorList = this._cursors.get(mm);
-        if (cursorList) {
-          for (let id of cursorList) {
-            this._db.clearDispatcher(id);
-          }
-          this._cursors.delete(mm);
-        }
-        break;
-      default:
-        if (DEBUG) debug("WRONG MESSAGE NAME: " + aMessage.name);
-    }
-  }
-}
-
-ContactService.init();