Bug 667233 - Follow-up to loosen the restriction on preferredOriginScheme due to tests using data: and chrome:

Also disable the autocomplete/autofill tests on Android.

MozReview-Commit-ID: P4mgzfNzda

--HG--
extra : rebase_source : 2c4e98338fe136da08378b9befc7f68a455ff9d1

toolkit/components/passwordmgr/LoginHelper.jsm

@@ -375,8 +375,8 @@ this.LoginHelper = {
     }
 
     if (!preferredOriginScheme && resolveBy.includes("scheme")) {
-      throw new Error("dedupeLogins: Deduping with a scheme preference but couldn't " +
-                      "get the preferred origin scheme.");
+      log.warn("dedupeLogins: Deduping with a scheme preference but couldn't " +
+               "get the preferred origin scheme.");
     }
 
     // We use a Map to easily lookup logins by their unique keys.

toolkit/components/passwordmgr/test/mochitest/mochitest.ini

@@ -13,7 +13,9 @@ support-files =
   auth2/authenticate.sjs
 
 [test_autocomplete_https_upgrade.html]
+skip-if = toolkit == 'android' # autocomplete
 [test_autofill_https_upgrade.html]
+skip-if = toolkit == 'android' # Bug 1259768
 [test_autofill_password-only.html]
 [test_basic_form.html]
 [test_basic_form_0pw.html]

toolkit/components/passwordmgr/test/unit/test_dedupeLogins.js

@@ -272,14 +272,6 @@ add_task(function* test_dedupeLogins_preferredOriginMissing() {
       ["scheme", "timePasswordChanged"],
       "",
     ],
-    [
-      "resolveBy scheme + timePasswordChanged, invalid preferredOrigin",
-      /preferred origin/,
-      [DOMAIN1_HTTPS_TO_HTTPS_U1_P1, DOMAIN1_HTTP_TO_HTTP_U1_P1],
-      undefined,
-      ["scheme", "timePasswordChanged"],
-      "example.com",
-    ],
   ];
 
   for (let tc of testcases) {