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 inside removed dir complete MAR file patch apply success test */ |
michael@0 | 6 | |
michael@0 | 7 | function run_test() { |
michael@0 | 8 | setupTestCommon(); |
michael@0 | 9 | gTestFiles = gTestFilesCompleteSuccess; |
michael@0 | 10 | gTestDirs = gTestDirsCompleteSuccess; |
michael@0 | 11 | setupUpdaterTest(FILE_COMPLETE_MAR, false, true); |
michael@0 | 12 | |
michael@0 | 13 | let fileInUseBin = getApplyDirFile(gTestDirs[4].relPathDir + |
michael@0 | 14 | gTestDirs[4].subDirs[0] + |
michael@0 | 15 | gTestDirs[4].subDirFiles[0]); |
michael@0 | 16 | // Remove the empty file created for the test so the helper application can |
michael@0 | 17 | // replace it. |
michael@0 | 18 | fileInUseBin.remove(false); |
michael@0 | 19 | |
michael@0 | 20 | let helperBin = getTestDirFile(FILE_HELPER_BIN); |
michael@0 | 21 | let fileInUseDir = getApplyDirFile(gTestDirs[4].relPathDir + |
michael@0 | 22 | gTestDirs[4].subDirs[0]); |
michael@0 | 23 | helperBin.copyTo(fileInUseDir, gTestDirs[4].subDirFiles[0]); |
michael@0 | 24 | |
michael@0 | 25 | // Launch an existing file so it is in use during the update. |
michael@0 | 26 | let args = [getApplyDirPath() + "a/b/", "input", "output", "-s", |
michael@0 | 27 | HELPER_SLEEP_TIMEOUT]; |
michael@0 | 28 | let fileInUseProcess = AUS_Cc["@mozilla.org/process/util;1"]. |
michael@0 | 29 | createInstance(AUS_Ci.nsIProcess); |
michael@0 | 30 | fileInUseProcess.init(fileInUseBin); |
michael@0 | 31 | fileInUseProcess.run(false, args, args.length); |
michael@0 | 32 | |
michael@0 | 33 | do_timeout(TEST_HELPER_TIMEOUT, waitForHelperSleep); |
michael@0 | 34 | } |
michael@0 | 35 | |
michael@0 | 36 | function doUpdate() { |
michael@0 | 37 | runUpdate(0, STATE_SUCCEEDED); |
michael@0 | 38 | } |
michael@0 | 39 | |
michael@0 | 40 | function checkUpdateApplied() { |
michael@0 | 41 | setupHelperFinish(); |
michael@0 | 42 | } |
michael@0 | 43 | |
michael@0 | 44 | function checkUpdate() { |
michael@0 | 45 | checkFilesAfterUpdateSuccess(); |
michael@0 | 46 | checkUpdateLogContains(ERR_BACKUP_DISCARD); |
michael@0 | 47 | checkCallbackAppLog(); |
michael@0 | 48 | } |