Bug 871445 - patch 8 - DataStore: disabled by default, r=ehsan

b2g/app/b2g.js

@@ -795,7 +795,8 @@ pref("network.sntp.timeout", 30); // In seconds.
 // Enable promise
 pref("dom.promise.enabled", false);
 
-pref("dom.datastore.enabled", true);
+// Enable dataStore
+pref("dom.datastore.enabled", false);
 
 // DOM Inter-App Communication API.
 #ifdef MOZ_WIDGET_GONK

dom/datastore/tests/test_app_install.html

@@ -22,7 +22,10 @@
     [{ "type": "browser", "allow": 1, "context": document },
      { "type": "embed-apps", "allow": 1, "context": document },
      { "type": "webapps-manage", "allow": 1, "context": document }],
-    function() { gGenerator.next() });
+    function() {
+      SpecialPowers.pushPrefEnv({"set": [["dom.datastore.enabled", true]]}, function() {
+        gGenerator.next(); });
+    });
 
   function continueTest() {
     try { gGenerator.next(); }

dom/datastore/tests/test_arrays.html

@@ -79,6 +79,10 @@
       SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true]]}, runTest);
     },
 
+    function() {
+      SpecialPowers.pushPrefEnv({"set": [["dom.datastore.enabled", true]]}, runTest);
+    },
+
     function() {
       SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
       runTest();

dom/datastore/tests/test_basic.html

@@ -79,6 +79,10 @@
       SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true]]}, runTest);
     },
 
+    function() {
+      SpecialPowers.pushPrefEnv({"set": [["dom.datastore.enabled", true]]}, runTest);
+    },
+
     function() {
       SpecialPowers.setBoolPref("dom.mozBrowserFramesEnabled", true);
       runTest();

dom/datastore/tests/test_changes.html

@@ -123,6 +123,10 @@
       SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true]]}, runTest);
     },
 
+    function() {
+      SpecialPowers.pushPrefEnv({"set": [["dom.datastore.enabled", true]]}, runTest);
+    },
+
     // Enabling mozBrowser
     function() {
       SpecialPowers.pushPrefEnv({"set": [["dom.mozBrowserFramesEnabled", true]]}, runTest);

dom/datastore/tests/test_readonly.html

@@ -96,7 +96,9 @@
 
   SpecialPowers.Cu.import("resource://gre/modules/DataStoreChangeNotifier.jsm");
   SimpleTest.waitForExplicitFinish();
-  SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true]]}, runTest);
+  SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true]]}, function() {
+    SpecialPowers.pushPrefEnv({"set": [["dom.datastore.enabled", true]]}, runTest);
+  });
   </script>
 </body>
 </html>

dom/datastore/tests/test_revision.html

@@ -88,6 +88,10 @@
       SpecialPowers.pushPrefEnv({"set": [["dom.promise.enabled", true]]}, runTest);
     },
 
+    function() {
+      SpecialPowers.pushPrefEnv({"set": [["dom.datastore.enabled", true]]}, runTest);
+    },
+
     // Enabling mozBrowser
     function() {
       SpecialPowers.pushPrefEnv({"set": [["dom.mozBrowserFramesEnabled", true]]}, runTest);

modules/libpref/src/init/all.js

@@ -4434,11 +4434,8 @@ pref("dom.forms.inputmode", true);
 // InputMethods for soft keyboards in B2G
 pref("dom.mozInputMethod.enabled", false);
 
-#ifdef RELEASE_BUILD
+// DataStore is disabled by default
 pref("dom.datastore.enabled", false);
-#else
-pref("dom.datastore.enabled", true);
-#endif
 
 // Telephony API
 pref("dom.telephony.enabled", false);