From 8ff285737af4157d1591208c9defc91d945657d3 Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sun, 12 Mar 2017 19:20:10 -0700
Subject: [PATCH] Backed out changeset 2ad68bdfb2ed (bug 1344590) for mochitest
 bustage

MozReview-Commit-ID: 7lUtSXTsmnT
---
 toolkit/components/extensions/ExtensionUtils.jsm      | 11 +++++------
 .../test/xpcshell/test_ext_schemas_revoke.js          |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/toolkit/components/extensions/ExtensionUtils.jsm b/toolkit/components/extensions/ExtensionUtils.jsm
index 5872975e384a..7e670032954d 100644
--- a/toolkit/components/extensions/ExtensionUtils.jsm
+++ b/toolkit/components/extensions/ExtensionUtils.jsm
@@ -96,11 +96,6 @@ let StartupCache = {
   },
 
   async reallyOpen(invalidate = false) {
-    if (Services.appinfo.processType !== Services.appinfo.PROCESS_TYPE_DEFAULT) {
-      throw new Error("Startup cache only supported in parent process");
-    }
-    Services.obs.addObserver(StartupCache, "startupcache-invalidate", false);
-
     if (this.dbPromise) {
       let db = await this.dbPromise;
       db.close();
@@ -109,7 +104,9 @@ let StartupCache = {
     if (invalidate) {
       this.cacheInvalidated = ExtensionManagement.cacheInvalidated;
 
-      IndexedDB.deleteDatabase(this.DB_NAME, {storage: "persistent"});
+      if (Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT) {
+        IndexedDB.deleteDatabase(this.DB_NAME, {storage: "persistent"});
+      }
     }
 
     return IndexedDB.open(this.DB_NAME,
@@ -134,6 +131,8 @@ let StartupCache = {
   },
 };
 
+Services.obs.addObserver(StartupCache, "startupcache-invalidate", false);
+
 class CacheStore {
   constructor(storeName) {
     this.storeName = storeName;
diff --git a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_revoke.js b/toolkit/components/extensions/test/xpcshell/test_ext_schemas_revoke.js
index 99a7b5007de7..7f14ee7c1942 100644
--- a/toolkit/components/extensions/test/xpcshell/test_ext_schemas_revoke.js
+++ b/toolkit/components/extensions/test/xpcshell/test_ext_schemas_revoke.js
@@ -438,7 +438,7 @@ add_task(function* () {
 });
 
 
-add_task(function* test_invalidated_lazy_injection() {
+add_task(function* test_neuter() {
   context.permissionsChanged = null;
 
   let root = {};