Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | <?xml version="1.0"?> |
michael@0 | 2 | <!-- |
michael@0 | 3 | /* Any copyright is dedicated to the Public Domain. |
michael@0 | 4 | * http://creativecommons.org/publicdomain/zero/1.0/ |
michael@0 | 5 | */ |
michael@0 | 6 | --> |
michael@0 | 7 | |
michael@0 | 8 | <?xml-stylesheet href="chrome://global/skin" type="text/css"?> |
michael@0 | 9 | <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css" type="text/css"?> |
michael@0 | 10 | |
michael@0 | 11 | <window title="Update Wizard pages: update check and basic (never button test)" |
michael@0 | 12 | xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" |
michael@0 | 13 | onload="runTestDefault();"> |
michael@0 | 14 | <script type="application/javascript" |
michael@0 | 15 | src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/> |
michael@0 | 16 | <script type="application/javascript" |
michael@0 | 17 | src="utils.js"/> |
michael@0 | 18 | |
michael@0 | 19 | <script type="application/javascript"> |
michael@0 | 20 | <![CDATA[ |
michael@0 | 21 | |
michael@0 | 22 | gPrefToCheck = PREF_APP_UPDATE_NEVER_BRANCH + Services.appinfo.version; |
michael@0 | 23 | |
michael@0 | 24 | const TESTS = [ { |
michael@0 | 25 | pageid: PAGEID_CHECKING |
michael@0 | 26 | }, { |
michael@0 | 27 | pageid: PAGEID_FOUND_BASIC, |
michael@0 | 28 | extraDelayedCheckFunction: checkPrefHasUserValue, |
michael@0 | 29 | prefHasUserValue: false, |
michael@0 | 30 | neverButton: true, |
michael@0 | 31 | buttonClick: "extra2" |
michael@0 | 32 | } ]; |
michael@0 | 33 | |
michael@0 | 34 | function runTest() { |
michael@0 | 35 | debugDump("entering"); |
michael@0 | 36 | |
michael@0 | 37 | let url = URL_HTTP_UPDATE_XML + "?showNever=1&showDetails=1" + |
michael@0 | 38 | getVersionParams(); |
michael@0 | 39 | setUpdateURLOverride(url); |
michael@0 | 40 | |
michael@0 | 41 | // add the never preference for this version to verify that checking for |
michael@0 | 42 | // updates clears the preference. |
michael@0 | 43 | Services.prefs.setBoolPref(gPrefToCheck, true) |
michael@0 | 44 | |
michael@0 | 45 | gUP.checkForUpdates(); |
michael@0 | 46 | } |
michael@0 | 47 | |
michael@0 | 48 | function finishTest() { |
michael@0 | 49 | checkPrefHasUserValue(true); |
michael@0 | 50 | finishTestDefault(); |
michael@0 | 51 | } |
michael@0 | 52 | |
michael@0 | 53 | ]]> |
michael@0 | 54 | </script> |
michael@0 | 55 | |
michael@0 | 56 | <body xmlns="http://www.w3.org/1999/xhtml"> |
michael@0 | 57 | <p id="display"></p> |
michael@0 | 58 | <div id="content" style="display: none"></div> |
michael@0 | 59 | <pre id="test"></pre> |
michael@0 | 60 | </body> |
michael@0 | 61 | </window> |