[tbb-commits] [tor-browser/tor-browser-38.1.0esr-5.x-1] Bug 16439: remove screencasting code.

[mikeperry at torproject.org]

commit b8fc9ed4eb889944b1f6d19723e11acb549b1bd5
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Wed Jun 24 11:01:11 2015 -0400

    Bug 16439: remove screencasting code.
    
    Screencasting is disabled in desktop browsers because
    browser.casting.enabled = false.  However, to avoid including
    code that could lead to proxy bypass, we exclude the related
    JS modules from Tor Browser.
---
 browser/modules/moz.build |    6 +++++-
 toolkit/modules/moz.build |   10 ++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/browser/modules/moz.build b/browser/modules/moz.build
index 574455c..3c0162c 100644
--- a/browser/modules/moz.build
+++ b/browser/modules/moz.build
@@ -12,7 +12,6 @@ XPCSHELL_TESTS_MANIFESTS += [
 
 EXTRA_JS_MODULES += [
     'BrowserUITelemetry.jsm',
-    'CastingApps.jsm',
     'Chat.jsm',
     'ContentClick.jsm',
     'ContentLinkHandler.jsm',
@@ -39,6 +38,11 @@ EXTRA_JS_MODULES += [
     'WebappManager.jsm',
 ]
 
+if not CONFIG['TOR_BROWSER_VERSION']:
+    EXTRA_JS_MODULES += [
+        'CastingApps.jsm',
+    ]
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     EXTRA_JS_MODULES += [
         'Windows8WindowFrameColor.jsm',
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 35c9a80..6416ac4 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -44,7 +44,6 @@ EXTRA_JS_MODULES += [
     'RemoteSecurityUI.jsm',
     'RemoteWebNavigation.jsm',
     'RemoteWebProgress.jsm',
-    'secondscreen/SimpleServiceDiscovery.jsm',
     'SelectContentHelper.jsm',
     'SelectParentHelper.jsm',
     'sessionstore/FormData.jsm',
@@ -66,7 +65,6 @@ EXTRA_PP_JS_MODULES += [
     'GMPInstallManager.jsm',
     'GMPUtils.jsm',
     'ResetProfile.jsm',
-    'secondscreen/RokuApp.jsm',
     'Services.jsm',
     'Troubleshoot.jsm',
     'UpdateChannel.jsm',
@@ -74,6 +72,14 @@ EXTRA_PP_JS_MODULES += [
     'WindowsPrefSync.jsm',
 ]
 
+if not CONFIG['TOR_BROWSER_VERSION']:
+    EXTRA_JS_MODULES += [
+        'secondscreen/SimpleServiceDiscovery.jsm',
+    ]
+    EXTRA_PP_JS_MODULES += [
+        'secondscreen/RokuApp.jsm',
+    ]
+
 if 'Android' != CONFIG['OS_TARGET']:
     EXTRA_PP_JS_MODULES += [
         'LightweightThemeConsumer.jsm',