Bug 1129650 - Touching navigator.mozId causes an error NS_ERROR_FACTO…

…RY_NOT_REGISTERED. r=baku
rmottola · Aug 17, 2019 · 3e60c1a · 3e60c1a
1 parent caa6c68
commit 3e60c1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
@@ -556,9 +556,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
@@ -89,7 +89,6 @@ DIRS += [
     'indexedDB',
     'system',
     'ipc',
-    'identity',
     'workers',
     'camera',
     'audiochannel',
@@ -146,6 +145,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
@@ -245,7 +245,6 @@ WEBIDL_FILES = [
     'IDBRequest.webidl',
     'IDBTransaction.webidl',
     'IDBVersionChangeEvent.webidl',
-    'Identity.webidl',
     'ImageCapture.webidl',
     'ImageData.webidl',
     'ImageDocument.webidl',
@@ -826,3 +825,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
@@ -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"