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 | MARIONETTE_TIMEOUT = 60000; |
michael@0 | 5 | MARIONETTE_HEAD_JS = 'head.js'; |
michael@0 | 6 | |
michael@0 | 7 | function testConferenceThreeAndRemoveOne() { |
michael@0 | 8 | log('= testConferenceThreeAndRemoveOne ='); |
michael@0 | 9 | |
michael@0 | 10 | let outCall; |
michael@0 | 11 | let inCall; |
michael@0 | 12 | let inCall2; |
michael@0 | 13 | let outNumber = "5555550101"; |
michael@0 | 14 | let inNumber = "5555550201"; |
michael@0 | 15 | let inNumber2 = "5555550202"; |
michael@0 | 16 | let outInfo = gOutCallStrPool(outNumber); |
michael@0 | 17 | let inInfo = gInCallStrPool(inNumber); |
michael@0 | 18 | let inInfo2 = gInCallStrPool(inNumber2); |
michael@0 | 19 | |
michael@0 | 20 | return Promise.resolve() |
michael@0 | 21 | .then(() => gSetupConferenceThreeCalls(outNumber, inNumber, inNumber2)) |
michael@0 | 22 | .then(calls => { |
michael@0 | 23 | [outCall, inCall, inCall2] = calls; |
michael@0 | 24 | }) |
michael@0 | 25 | .then(() => gRemoveCallInConference(outCall, [], [inCall, inCall2], |
michael@0 | 26 | function() { |
michael@0 | 27 | gCheckState(outCall, [outCall], 'held', [inCall, inCall2]); |
michael@0 | 28 | })) |
michael@0 | 29 | .then(() => gCheckAll(outCall, [outCall], 'held', [inCall, inCall2], |
michael@0 | 30 | [outInfo.active, inInfo.held, inInfo2.held])) |
michael@0 | 31 | .then(() => gRemoteHangUpCalls([outCall, inCall, inCall2])); |
michael@0 | 32 | } |
michael@0 | 33 | |
michael@0 | 34 | // Start the test |
michael@0 | 35 | startTest(function() { |
michael@0 | 36 | testConferenceThreeAndRemoveOne() |
michael@0 | 37 | .then(null, error => { |
michael@0 | 38 | ok(false, 'promise rejects during test.'); |
michael@0 | 39 | }) |
michael@0 | 40 | .then(finish); |
michael@0 | 41 | }); |