From 200e49a7be122854bb73d733ac328ff4b17a7725 Mon Sep 17 00:00:00 2001
From: Mark Banner <standard8@mozilla.com>
Date: Wed, 19 Nov 2014 09:55:34 +0000
Subject: [PATCH] Follow-up to bug 1099128 - temporarily turn off rooms for
 mochitests to fix bc1 test failures. rs+a=bustage-fix

---
 browser/components/loop/test/mochitest/head.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/browser/components/loop/test/mochitest/head.js b/browser/components/loop/test/mochitest/head.js
index 44160fca035..6b438cade46 100644
--- a/browser/components/loop/test/mochitest/head.js
+++ b/browser/components/loop/test/mochitest/head.js
@@ -77,6 +77,11 @@ function promiseGetMozLoopAPI() {
  * This assumes that the tests are running in a generatorTest.
  */
 function loadLoopPanel(aOverrideOptions = {}) {
+  Services.prefs.setBoolPref("loop.rooms.enabled", false);
+  registerCleanupFunction(function() {
+     Services.prefs.clearUserPref("loop.rooms.enabled");
+  });
+
   // Set prefs to ensure we don't access the network externally.
   Services.prefs.setCharPref("services.push.serverURL", aOverrideOptions.pushURL || "ws://localhost/");
   Services.prefs.setCharPref("loop.server", aOverrideOptions.loopURL || "http://localhost/");