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 | /* Any copyright is dedicated to the Public Domain. |
michael@0 | 2 | * http://creativecommons.org/publicdomain/zero/1.0/ |
michael@0 | 3 | */ |
michael@0 | 4 | |
michael@0 | 5 | /* File in use complete MAR file patch apply success test */ |
michael@0 | 6 | |
michael@0 | 7 | function run_test() { |
michael@0 | 8 | if (!shouldRunServiceTest()) { |
michael@0 | 9 | return; |
michael@0 | 10 | } |
michael@0 | 11 | |
michael@0 | 12 | setupTestCommon(); |
michael@0 | 13 | gTestFiles = gTestFilesCompleteSuccess; |
michael@0 | 14 | gTestDirs = gTestDirsCompleteSuccess; |
michael@0 | 15 | setupUpdaterTest(FILE_COMPLETE_MAR, false, true); |
michael@0 | 16 | |
michael@0 | 17 | // Launch an existing file so it is in use during the update. |
michael@0 | 18 | let fileInUseBin = getApplyDirFile(gTestFiles[13].relPathDir + |
michael@0 | 19 | gTestFiles[13].fileName); |
michael@0 | 20 | let args = [getApplyDirPath() + "a/b/", "input", "output", "-s", |
michael@0 | 21 | HELPER_SLEEP_TIMEOUT]; |
michael@0 | 22 | let fileInUseProcess = AUS_Cc["@mozilla.org/process/util;1"]. |
michael@0 | 23 | createInstance(AUS_Ci.nsIProcess); |
michael@0 | 24 | fileInUseProcess.init(fileInUseBin); |
michael@0 | 25 | fileInUseProcess.run(false, args, args.length); |
michael@0 | 26 | |
michael@0 | 27 | setupAppFilesAsync(); |
michael@0 | 28 | } |
michael@0 | 29 | |
michael@0 | 30 | function setupAppFilesFinished() { |
michael@0 | 31 | do_timeout(TEST_HELPER_TIMEOUT, waitForHelperSleep); |
michael@0 | 32 | } |
michael@0 | 33 | |
michael@0 | 34 | function doUpdate() { |
michael@0 | 35 | runUpdateUsingService(STATE_PENDING_SVC, STATE_SUCCEEDED); |
michael@0 | 36 | } |
michael@0 | 37 | |
michael@0 | 38 | function checkUpdateFinished() { |
michael@0 | 39 | setupHelperFinish(); |
michael@0 | 40 | } |
michael@0 | 41 | |
michael@0 | 42 | function checkUpdate() { |
michael@0 | 43 | checkFilesAfterUpdateSuccess(); |
michael@0 | 44 | checkUpdateLogContains(ERR_BACKUP_DISCARD); |
michael@0 | 45 | checkCallbackServiceLog(); |
michael@0 | 46 | } |