Bug 1287884 - Ensure that the pref controlling the webchannel whitelist is initialized on fennec. r=markh
authorThom Chiovoloni <tchiovoloni@mozilla.com>
Tue, 19 Jul 2016 14:52:06 -0400
changeset 331381 3600dd10c023470a8ff78f712c09e7c6f5e02770
parent 331380 0cf1259b7073d19d6c78362b04007ccc12f07fcb
child 331382 e5341bb0157c904feeb2589e08c2039645adf15b
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh
bugs1287884
milestone50.0a1
Bug 1287884 - Ensure that the pref controlling the webchannel whitelist is initialized on fennec. r=markh MozReview-Commit-ID: 9NRIWdXx7eo
browser/app/profile/firefox.js
mobile/android/app/mobile.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1458,10 +1458,10 @@ pref("dom.mozBrowserFramesEnabled", true
 pref("extensions.pocket.enabled", true);
 
 pref("signon.schemeUpgrades", true);
 
 // Enable the "Simplify Page" feature in Print Preview
 pref("print.use_simplify_page", true);
 
 // Space separated list of URLS that are allowed to send objects (instead of
-// only strings) through webchannels.
+// only strings) through webchannels. This list is duplicated in mobile/android/app/mobile.js
 pref("webchannel.allowObject.urlWhitelist", "https://accounts.firefox.com https://content.cdn.mozilla.net https://hello.firefox.com https://input.mozilla.org https://support.mozilla.org https://install.mozilla.org");
--- a/mobile/android/app/mobile.js
+++ b/mobile/android/app/mobile.js
@@ -915,8 +915,12 @@ pref("identity.sync.tokenserver.uri", "h
 
 // Enable Presentation API
 pref("dom.presentation.enabled", true);
 pref("dom.presentation.discovery.enabled", true);
 pref("dom.presentation.discovery.legacy.enabled", true); // for TV 2.5 backward capability
 
 pref("dom.audiochannel.audioCompeting", true);
 pref("dom.audiochannel.mediaControl", true);
+
+// Space separated list of URLS that are allowed to send objects (instead of
+// only strings) through webchannels. This list is duplicated in browser/app/profile/firefox.js
+pref("webchannel.allowObject.urlWhitelist", "https://accounts.firefox.com https://content.cdn.mozilla.net https://hello.firefox.com https://input.mozilla.org https://support.mozilla.org https://install.mozilla.org");