| OLD | NEW |
| 1 if (window.testRunner) { | 1 if (window.testRunner) { |
| 2 // In Chromium we need to change the setting to disallow displaying | 2 // In Chromium we need to change the setting to disallow displaying |
| 3 // insecure contents. | 3 // insecure contents. |
| 4 | 4 |
| 5 // By default, LayoutTest content_shell returns allowed for | 5 // By default, LayoutTest content_shell returns allowed for |
| 6 // "Should fetching request be blocked as mixed content?" at Step 5: | 6 // "Should fetching request be blocked as mixed content?" at Step 5: |
| 7 // https://w3c.github.io/webappsec/specs/mixedcontent/#should-block-fetch | 7 // https://w3c.github.io/webappsec/specs/mixedcontent/#should-block-fetch |
| 8 // > If the user agent has been instructed to allow mixed content | 8 // > If the user agent has been instructed to allow mixed content |
| 9 // Turning the switch below to false makes this condition above false, and | 9 // Turning the switch below to false makes this condition above false, and |
| 10 // make content_shell to run into Step 7 to test mixed content blocking. | 10 // make content_shell to run into Step 7 to test mixed content blocking. |
| 11 testRunner.overridePreference('WebKitAllowRunningInsecureContent', false); | 11 testRunner.overridePreference('WebKitAllowRunningInsecureContent', false); |
| 12 //FIXME: to be removed. | |
| 13 //testRunner.overridePreference('WebKitAllowDisplayingInsecureContent', true); | |
| 14 | 12 |
| 15 // Accept all cookies. | 13 // Accept all cookies. |
| 16 testRunner.setBlockThirdPartyCookies(false); | 14 testRunner.setBlockThirdPartyCookies(false); |
| 17 } | 15 } |
| 18 | 16 |
| 19 // How tests starts: | 17 // How tests starts: |
| 20 // 1. http://127.0.0.1:8000/.../X.html is loaded. | 18 // 1. http://127.0.0.1:8000/.../X.html is loaded. |
| 21 // 2. init(): Do initialization. | 19 // 2. init(): Do initialization. |
| 22 // In thorough/* tests | 20 // In thorough/* tests |
| 23 // (see init() in thorough-util.js): | 21 // (see init() in thorough-util.js): |
| (...skipping 17 matching lines...) Expand all Loading... |
| 41 } else { | 39 } else { |
| 42 // Step 3a. For non-base-https tests, start tests here. | 40 // Step 3a. For non-base-https tests, start tests here. |
| 43 start(t); | 41 start(t); |
| 44 } | 42 } |
| 45 }); | 43 }); |
| 46 } else { | 44 } else { |
| 47 // Step 4b. Already redirected to the HTTPS page. | 45 // Step 4b. Already redirected to the HTTPS page. |
| 48 // Start tests for base-https tests here. | 46 // Start tests for base-https tests here. |
| 49 start(t); | 47 start(t); |
| 50 } | 48 } |
| OLD | NEW |