[tor-commits] [tor-browser/esr24] Bug 1022785 - Disable android snippets for reftests/crashtests/jsreftests. r=jmaher, a=test-only

[mikeperry at torproject.org]

commit 91405b0182327da5f5cb302fab885f09481431c3
Author: Nathan Froyd <froydnj at mozilla.com>
Date:   Mon Jun 9 13:37:21 2014 -0400

    Bug 1022785 - Disable android snippets for reftests/crashtests/jsreftests. r=jmaher, a=test-only
---
 js/src/tests/user.js               |    2 ++
 layout/tools/reftest/runreftest.py |    3 +++
 2 files changed, 5 insertions(+)

diff --git a/js/src/tests/user.js b/js/src/tests/user.js
index 694d4d0..d106db4 100755
--- a/js/src/tests/user.js
+++ b/js/src/tests/user.js
@@ -29,3 +29,5 @@ user_pref("security.turn_off_all_security_so_that_viruses_can_take_over_this_com
 user_pref("toolkit.telemetry.enabled", false);
 user_pref("browser.safebrowsing.enabled", false);
 user_pref("browser.safebrowsing.malware.enabled", false);
+user_pref("browser.snippets.enabled", false);
+user_pref("browser.snippets.syncPromo.enabled", false);
diff --git a/layout/tools/reftest/runreftest.py b/layout/tools/reftest/runreftest.py
index 2bb3d11..c16955a 100644
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -77,6 +77,9 @@ class RefTest(object):
     # Likewise for safebrowsing.
     prefsFile.write('user_pref("browser.safebrowsing.enabled", false);\n')
     prefsFile.write('user_pref("browser.safebrowsing.malware.enabled", false);\n')
+    # And for snippets.
+    prefsFile.write('user_pref("browser.snippets.enabled", false);\n')
+    prefsFile.write('user_pref("browser.snippets.syncPromo.enabled", false);\n')
 
     for v in options.extraPrefs:
       thispref = v.split("=")