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 | /* Application in use 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, false); |
michael@0 | 12 | |
michael@0 | 13 | // Launch the callback helper application so it is in use during the update. |
michael@0 | 14 | let callbackApp = getApplyDirFile("a/b/" + gCallbackBinFile); |
michael@0 | 15 | callbackApp.permissions = PERMS_DIRECTORY; |
michael@0 | 16 | let args = [getApplyDirPath() + "a/b/", "input", "output", "-s", |
michael@0 | 17 | HELPER_SLEEP_TIMEOUT]; |
michael@0 | 18 | let callbackAppProcess = AUS_Cc["@mozilla.org/process/util;1"]. |
michael@0 | 19 | createInstance(AUS_Ci.nsIProcess); |
michael@0 | 20 | callbackAppProcess.init(callbackApp); |
michael@0 | 21 | callbackAppProcess.run(false, args, args.length); |
michael@0 | 22 | |
michael@0 | 23 | do_timeout(TEST_HELPER_TIMEOUT, waitForHelperSleep); |
michael@0 | 24 | } |
michael@0 | 25 | |
michael@0 | 26 | function doUpdate() { |
michael@0 | 27 | // For Mac OS X set the last modified time for the root directory to a date in |
michael@0 | 28 | // the past to test that the last modified time is updated on a successful |
michael@0 | 29 | // update (bug 600098). |
michael@0 | 30 | if (IS_MACOSX) { |
michael@0 | 31 | let applyToDir = getApplyDirFile(); |
michael@0 | 32 | let now = Date.now(); |
michael@0 | 33 | let yesterday = now - (1000 * 60 * 60 * 24); |
michael@0 | 34 | applyToDir.lastModifiedTime = yesterday; |
michael@0 | 35 | } |
michael@0 | 36 | |
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 | if (IS_MACOSX) { |
michael@0 | 46 | logTestInfo("testing last modified time on the apply to directory has " + |
michael@0 | 47 | "changed after a successful update (bug 600098)"); |
michael@0 | 48 | let now = Date.now(); |
michael@0 | 49 | let applyToDir = getApplyDirFile(); |
michael@0 | 50 | let timeDiff = Math.abs(applyToDir.lastModifiedTime - now); |
michael@0 | 51 | do_check_true(timeDiff < MAC_MAX_TIME_DIFFERENCE); |
michael@0 | 52 | } |
michael@0 | 53 | |
michael@0 | 54 | checkFilesAfterUpdateSuccess(); |
michael@0 | 55 | // Sorting on Linux is different so skip this check for now. |
michael@0 | 56 | if (!IS_UNIX) { |
michael@0 | 57 | checkUpdateLogContents(LOG_COMPLETE_SUCCESS); |
michael@0 | 58 | } |
michael@0 | 59 | |
michael@0 | 60 | checkCallbackAppLog(); |
michael@0 | 61 | } |