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