diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-31 09:45:25 +0200 |
| commit | 2d4ff8df91414b42974c72b2870f5c6e9ad397a8 (patch) | |
| tree | 15b23dc6494a147e723cfdb3765be1568cf6c113 /devtools/client | |
| parent | f4b8be889cb7ee31a62af5660f36aaa192599009 (diff) | |
| parent | 14eb8dc7bee8670e39d1199591d335579601f2ad (diff) | |
| download | UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.gz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.lz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.tar.xz UXP-2d4ff8df91414b42974c72b2870f5c6e9ad397a8.zip | |
Merge branch 'master' into Basilisk-release
Diffstat (limited to 'devtools/client')
4 files changed, 1 insertions, 11 deletions
diff --git a/devtools/client/responsive.html/browser/tunnel.js b/devtools/client/responsive.html/browser/tunnel.js index fdbfe8918..42eb010e7 100644 --- a/devtools/client/responsive.html/browser/tunnel.js +++ b/devtools/client/responsive.html/browser/tunnel.js @@ -407,8 +407,6 @@ MessageManagerTunnel.prototype = { "PageInfo:", // Messages sent from printUtils.js "Printing:", - // Messages sent from browser-social.js - "Social:", "PageMetadata:", // Messages sent from viewSourceUtils.js "ViewSource:", @@ -427,8 +425,6 @@ MessageManagerTunnel.prototype = { "PageInfo:", // Messages sent to printUtils.js "Printing:", - // Messages sent to browser-social.js - "Social:", "PageMetadata:", // Messages sent to viewSourceUtils.js "ViewSource:", diff --git a/devtools/client/webconsole/console-output.js b/devtools/client/webconsole/console-output.js index 52d848494..bd290dcc6 100644 --- a/devtools/client/webconsole/console-output.js +++ b/devtools/client/webconsole/console-output.js @@ -31,7 +31,7 @@ const {PluralForm} = require("devtools/shared/plural-form"); const MAX_STRING_GRIP_LENGTH = 36; const {ELLIPSIS} = require("devtools/shared/l10n"); -const validProtocols = /^(http|https|ftp|data|javascript|resource|chrome):/i; +const validProtocols = /^(http|https|ftp|resource|chrome):/i; // Constants for compatibility with the Web Console output implementation before // bug 778766. diff --git a/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js index ff4157a3b..eb77bc158 100644 --- a/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js +++ b/devtools/client/webconsole/test/browser_webconsole_block_mixedcontent_securityerrors.js @@ -61,8 +61,6 @@ function pushPrefEnv() { "set": [ ["security.mixed_content.block_active_content", true], ["security.mixed_content.block_display_content", true], - ["security.mixed_content.use_hsts", false], - ["security.mixed_content.send_hsts_priming", false], ] }; SpecialPowers.pushPrefEnv(options, deferred.resolve); diff --git a/devtools/client/webconsole/test/browser_webconsole_bug_632817.js b/devtools/client/webconsole/test/browser_webconsole_bug_632817.js index 561e3b112..dc976411f 100644 --- a/devtools/client/webconsole/test/browser_webconsole_bug_632817.js +++ b/devtools/client/webconsole/test/browser_webconsole_bug_632817.js @@ -95,10 +95,6 @@ function testXhrWarn() { let lastRequest = yield waitForFinishedRequest(XHR_WARN_REQUEST_PREDICATE); if (lastRequest.request.method == "HEAD") { - // in non-e10s, we get the HEAD request that priming sends, so make sure - // a priming request should be sent, and then get the actual request - is(Services.prefs.getBoolPref("security.mixed_content.send_hsts_priming"), - true, "Found HSTS Priming Request"); lastRequest = yield waitForFinishedRequest(XHR_WARN_REQUEST_PREDICATE); } |