Backed out 2 changesets (bug 1534211, bug 1533651) for xpcshell failure at devtools/client/responsive.html/test/unit/test_change_device.js on a CLOSED TREE

Backed out changeset 00f84bd04433 (bug 1534211)
Backed out changeset a36496b378c7 (bug 1533651)

dom/base/nsGlobalWindowInner.cpp

@@ -1230,8 +1230,6 @@ void nsGlobalWindowInner::FreeInnerObjects() {
   mExternal = nullptr;
   mInstallTrigger = nullptr;
 
-  mLocalStorage = nullptr;
-  mSessionStorage = nullptr;
   mPerformance = nullptr;
 
   mSharedWorkers.Clear();

dom/quota/ActorsParent.cpp

@@ -1375,7 +1375,7 @@ void ReportInternalError(const char* aFile, uint32_t aLine, const char* aStr) {
 
 namespace {
 
-StaticAutoPtr<nsString> gBaseDirPath;
+nsString gBaseDirPath;
 
 #ifdef DEBUG
 bool gQuotaManagerInitialized = false;
@@ -2499,9 +2499,6 @@ QuotaManager::Observer::Observe(nsISupports* aSubject, const char* aTopic,
   nsresult rv;
 
   if (!strcmp(aTopic, kProfileDoChangeTopic)) {
-    MOZ_ASSERT(!gBaseDirPath);
-    gBaseDirPath = new nsString();
-
     nsCOMPtr<nsIFile> baseDir;
     rv = NS_GetSpecialDirectory(NS_APP_INDEXEDDB_PARENT_DIR,
                                 getter_AddRefs(baseDir));
@@ -2513,7 +2510,7 @@ QuotaManager::Observer::Observe(nsISupports* aSubject, const char* aTopic,
       return rv;
     }
 
-    rv = baseDir->GetPath(*gBaseDirPath);
+    rv = baseDir->GetPath(gBaseDirPath);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
@@ -2545,8 +2542,7 @@ QuotaManager::Observer::Observe(nsISupports* aSubject, const char* aTopic,
 
     MOZ_ALWAYS_TRUE(SpinEventLoopUntil([&]() { return mShutdownComplete; }));
 
-    MOZ_ASSERT(gBaseDirPath);
-    gBaseDirPath = nullptr;
+    gBaseDirPath.Truncate();
 
     return NS_OK;
   }
@@ -2907,7 +2903,6 @@ nsresult QuotaManager::Initialize() {
 void QuotaManager::GetOrCreate(nsIRunnable* aCallback,
                                nsIEventTarget* aMainEventTarget) {
   AssertIsOnBackgroundThread();
-  MOZ_ASSERT(gBaseDirPath);
 
   if (IsShuttingDown()) {
     MOZ_ASSERT(false, "Calling GetOrCreate() after shutdown!");
@@ -2919,7 +2914,7 @@ void QuotaManager::GetOrCreate(nsIRunnable* aCallback,
   } else {
     RefPtr<QuotaManager> manager = new QuotaManager();
 
-    nsresult rv = manager->Init(*gBaseDirPath);
+    nsresult rv = manager->Init(gBaseDirPath);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       gCreateFailed = true;
     } else {