From 3d1dca594ce5ce2b192ff976402906e9cc03ea74 Mon Sep 17 00:00:00 2001
From: Fernando Jimenez <ferjmoreno@gmail.com>
Date: Tue, 10 Mar 2015 17:25:39 +0100
Subject: [PATCH] Bug 1129650 - Touching navigator.mozId causes an error
 NS_ERROR_FACTORY_NOT_REGISTERED. r=baku

---
 browser/installer/package-manifest.in    |  3 ---
 dom/moz.build                            |  2 +-
 dom/webidl/moz.build                     |  6 +++++-
 toolkit/identity/tests/unit/xpcshell.ini | 12 +-----------
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 71ef386ab0fe..3e8a2d3d4adb 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -537,9 +537,6 @@
 @RESPATH@/components/Webapps.manifest
 @RESPATH@/components/AppsService.js
 @RESPATH@/components/AppsService.manifest
-@RESPATH@/components/nsDOMIdentity.js
-@RESPATH@/components/nsIDService.js
-@RESPATH@/components/Identity.manifest
 @RESPATH@/components/recording-cmdline.js
 @RESPATH@/components/recording-cmdline.manifest
 @RESPATH@/components/htmlMenuBuilder.js
diff --git a/dom/moz.build b/dom/moz.build
index 06aa5ec1be44..9ef5a69d8318 100644
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -90,7 +90,6 @@ DIRS += [
     'indexedDB',
     'system',
     'ipc',
-    'identity',
     'workers',
     'camera',
     'audiochannel',
@@ -142,6 +141,7 @@ if CONFIG['MOZ_SECUREELEMENT']:
 if CONFIG['MOZ_B2G']:
     DIRS += [
         'downloads',
+        'identity',
         'mobileid',
         'engineeringmode'
     ]
diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build
index 265e00b205eb..d9804a43c2f0 100644
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -243,7 +243,6 @@ WEBIDL_FILES = [
     'IDBRequest.webidl',
     'IDBTransaction.webidl',
     'IDBVersionChangeEvent.webidl',
-    'Identity.webidl',
     'ImageCapture.webidl',
     'ImageData.webidl',
     'ImageDocument.webidl',
@@ -827,3 +826,8 @@ if CONFIG['MOZ_PAY']:
     WEBIDL_FILES += [
         'MozPaymentProvider.webidl'
     ]
+
+if CONFIG['MOZ_B2G']:
+    WEBIDL_FILES += [
+        'Identity.webidl'
+    ]
diff --git a/toolkit/identity/tests/unit/xpcshell.ini b/toolkit/identity/tests/unit/xpcshell.ini
index 0355d765a07c..8ef9b79bc551 100644
--- a/toolkit/identity/tests/unit/xpcshell.ini
+++ b/toolkit/identity/tests/unit/xpcshell.ini
@@ -1,7 +1,7 @@
 [DEFAULT]
 head = head_identity.js
 tail = tail_identity.js
-skip-if = toolkit == 'gonk'
+skip-if = (appname != "b2g" || toolkit == 'gonk')
 support-files =
   data/idp_1/.well-known/browserid
   data/idp_invalid_1/.well-known/browserid
@@ -14,21 +14,11 @@ support-files =
 [test_identity_utils.js]
 [test_log_utils.js]
 [test_authentication.js]
-# Identity modules aren't packaged on Android.
-skip-if = os == "android"
 [test_crypto_service.js]
-skip-if = os == "android"
 [test_identity.js]
-skip-if = os == "android"
 [test_jwcrypto.js]
-skip-if = os == "android"
 [test_observer_topics.js]
-skip-if = os == "android"
 [test_provisioning.js]
-skip-if = os == "android"
 [test_relying_party.js]
-skip-if = os == "android"
 [test_store.js]
 [test_well-known.js]
-# Bug 905340 - http port dependency causes failure on Android 4.0
-skip-if = os == "android"