Bug 967414 - Enable DataStore API in B2G for certified apps only by default, r=bz

b2g/app/b2g.js

@@ -816,11 +816,7 @@ pref("network.sntp.port", 123);
 pref("network.sntp.timeout", 30); // In seconds.
 
 // Enable dataStore
-#ifdef RELEASE_BUILD
-pref("dom.datastore.enabled", false);
-#else
 pref("dom.datastore.enabled", true);
-#endif
 
 // DOM Inter-App Communication API.
 pref("dom.inter-app-communication-api.enabled", true);

dom/base/Navigator.cpp

@@ -1926,6 +1926,11 @@ Navigator::HasDataStoreSupport(JSContext* cx, JSObject* aGlobal)
 {
   JS::Rooted<JSObject*> global(cx, aGlobal);
 
+  // DataStore is enabled by default for chrome code.
+  if (nsContentUtils::IsCallerChrome()) {
+    return true;
+  }
+
   // First of all, the general pref has to be turned on.
   bool enabled = false;
   Preferences::GetBool("dom.datastore.enabled", &enabled);

dom/datastore/tests/file_certifiedApp.html

@@ -16,6 +16,8 @@
     alert('DONE');
   }
 
+  ok(!("DataStore" in window), "DataStore is not an available interface");
+  ok(!("DataStoreChangeEvent" in window), "DataStore is not an available interface");
   ok(!("getDataStores" in navigator), "DataStore not available");
   finish();
   </script>

dom/datastore/tests/test_certifiedApp.html

@@ -82,6 +82,8 @@
     },
 
     function() {
+      ok(!("DataStore" in window), "DataStore is not an available interface");
+      ok(!("DataStoreChangeEvent" in window), "DataStore is not an available interface");
       ok(!("getDataStores" in navigator), "getDataStores should not exist");
       runTest();
     },

dom/tests/mochitest/general/test_interfaces.html

@@ -263,11 +263,11 @@ var interfaceNamesInGlobalScope =
 // IMPORTANT: Do not change this list without review from a DOM peer!
     {name: "DataErrorEvent", b2g: true, pref: "dom.mobileconnection.enabled"},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "DataStore", b2g: true, release: false},
+    {name: "DataStore", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "DataStoreChangeEvent", b2g: true, release: false},
+    {name: "DataStoreChangeEvent", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
-    {name: "DataStoreCursor", b2g: true, release: false},
+    {name: "DataStoreCursor", b2g: true},
 // IMPORTANT: Do not change this list without review from a DOM peer!
     "DataTransfer",
 // IMPORTANT: Do not change this list without review from a DOM peer!

dom/webidl/DataStore.webidl

@@ -6,7 +6,7 @@
 
 typedef (DOMString or unsigned long) DataStoreKey;
 
-[Pref="dom.datastore.enabled",
+[Func="Navigator::HasDataStoreSupport",
  JSImplementation="@mozilla.org/dom/datastore;1"]
 interface DataStore : EventTarget {
   // Returns the label of the DataSource.

dom/webidl/DataStoreChangeEvent.webidl

@@ -10,7 +10,7 @@ dictionary DataStoreChangeEventInit : EventInit {
   DOMString operation = "";
 };
 
-[Pref="dom.datastore.enabled",
+[Func="Navigator::HasDataStoreSupport",
  Constructor(DOMString type, optional DataStoreChangeEventInit eventInitDict)]
 interface DataStoreChangeEvent : Event {
   readonly attribute DOMString revisionId;