Commit 019d53c2 authored by Arthur Edelstein's avatar Arthur Edelstein Committed by Georg Koppen
Browse files

Revert "Bug 21308: Set indexedDB->null when dom.indexeddb.enabled=false" 

This reverts commit 31348e47.
parent 99173c3a

dom/indexedDB/IDBFactory.cpp

+2 −2
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ IDBFactory::CreateForWindow(nsPIDOMWindowInner* aWindow, 
  if (!(NS_SUCCEEDED(rv) && nsContentUtils::IsSystemPrincipal(principal)) &&

      NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) {

    *aFactory = nullptr;

    return NS_OK;

    return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR;

  }



  if (rv == NS_ERROR_DOM_NOT_SUPPORTED_ERR) {
@@ -249,7 +249,7 @@ IDBFactory::CreateForMainThreadJSInternal( 
  if (aPrincipalInfo->type() != PrincipalInfo::TSystemPrincipalInfo &&

      NS_WARN_IF(!Preferences::GetBool(kPrefIndexedDBEnabled, false))) {

    *aFactory = nullptr;

    return NS_OK;

    return NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR;

  }



  IndexedDatabaseManager* mgr = IndexedDatabaseManager::GetOrCreate();

dom/indexedDB/test/mochitest.ini

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ skip-if = e10s 
[test_deleteDatabase_interactions.html]

[test_deleteDatabase_onblocked.html]

[test_deleteDatabase_onblocked_duringVersionChange.html]

[test_disable_indexeddb.html]

[test_error_events_abort_transactions.html]

[test_event_propagation.html]

[test_event_source.html]

dom/indexedDB/test/test_disable_indexeddb.html

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
<!DOCTYPE html>

<html>

<head>

  <title>Indexed Database Disable Pref test</title>



  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>

  <script type="text/javascript" src="/tests/SimpleTest/SpawnTask.js"></script>

  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>



</head>



<body>

  <script>

   add_task(function* () {

       for (let enable of [false, true]) {

           yield SpecialPowers.pushPrefEnv(

               {'set': [['dom.indexedDB.enabled', enable]]});

           if (!enable) {

               is(indexedDB, null, "indexedDB should be null");

           } else {

               isnot(indexedDB, null, "indexedDB should be non-null");

           }

       }

   });

  </script>

</body>



</html>