Backed out changeset 0aaa67fc61e8 (bug 858680)

dom/asmjscache/AsmJSCache.cpp

@@ -1850,10 +1850,6 @@ public:
     MOZ_ASSERT_UNREACHABLE("There are no storages");
   }
 
-  virtual void
-  PerformIdleMaintenance() override
-  { }
-
   virtual void
   ShutdownWorkThreads() override
   { }

dom/cache/QuotaClient.cpp

@@ -226,9 +226,6 @@ public:
     }
   }
 
-  virtual void
-  PerformIdleMaintenance() override
-  { }
 
   virtual void
   ShutdownWorkThreads() override

dom/indexedDB/ActorsParent.cpp

@@ -7862,10 +7862,6 @@ public:
   WaitForStoragesToComplete(nsTArray<nsIOfflineStorage*>& aStorages,
                             nsIRunnable* aCallback) override;
 
-  virtual void
-  PerformIdleMaintenance() override
-  { }
-
   virtual void
   ShutdownWorkThreads() override;
 

dom/quota/Client.h

@@ -115,9 +115,6 @@ public:
   WaitForStoragesToComplete(nsTArray<nsIOfflineStorage*>& aStorages,
                             nsIRunnable* aCallback) = 0;
 
-  virtual void
-  PerformIdleMaintenance() = 0;
-
   virtual void
   ShutdownWorkThreads() = 0;
 

dom/quota/QuotaManager.cpp

@@ -10,7 +10,6 @@
 #include "nsIBinaryInputStream.h"
 #include "nsIBinaryOutputStream.h"
 #include "nsIFile.h"
-#include "nsIIdleService.h"
 #include "nsIObserverService.h"
 #include "nsIOfflineStorage.h"
 #include "nsIPermissionManager.h"
@@ -1483,8 +1482,10 @@ QuotaManager::Init()
   NS_ASSERTION(mClients.Capacity() == Client::TYPE_MAX,
                "Should be using an auto array with correct capacity!");
 
+  nsRefPtr<Client> idbClient = indexedDB::CreateQuotaClient();
+
   // Register clients.
-  mClients.AppendElement(indexedDB::CreateQuotaClient());
+  mClients.AppendElement(idbClient);
   mClients.AppendElement(asmjscache::CreateClient());
   mClients.AppendElement(cache::CreateQuotaClient());
 
@@ -3060,13 +3061,6 @@ QuotaManager::Observe(nsISupports* aSubject,
     return NS_OK;
   }
 
-  if (!strcmp(aTopic, OBSERVER_TOPIC_IDLE_DAILY)) {
-    for (auto& client : mClients) {
-      client->PerformIdleMaintenance();
-    }
-    return NS_OK;
-  }
-
   NS_NOTREACHED("Unknown topic!");
   return NS_ERROR_UNEXPECTED;
 }

layout/build/nsLayoutModule.cpp

@@ -28,7 +28,6 @@
 #include "nsIDocumentEncoder.h"
 #include "nsIFactory.h"
 #include "nsIFrameUtil.h"
-#include "nsIIdleService.h"
 #include "nsHTMLStyleSheet.h"
 #include "nsILayoutDebugger.h"
 #include "nsNameSpaceManager.h"
@@ -1318,7 +1317,6 @@ static const mozilla::Module::CategoryEntry kLayoutCategories[] = {
   { "net-channel-event-sinks", NS_MIXEDCONTENTBLOCKER_CONTRACTID, NS_MIXEDCONTENTBLOCKER_CONTRACTID },
   { "app-startup", "Script Security Manager", "service," NS_SCRIPTSECURITYMANAGER_CONTRACTID },
   { TOPIC_WEB_APP_CLEAR_DATA, "QuotaManager", "service," QUOTA_MANAGER_CONTRACTID },
-  { OBSERVER_TOPIC_IDLE_DAILY, "QuotaManager", QUOTA_MANAGER_CONTRACTID },
 #ifdef MOZ_WIDGET_GONK
   { "app-startup", "Volume Service", "service," NS_VOLUMESERVICE_CONTRACTID },
 #endif