Bug 1415342 - Part 1 - Move OfflineAppCacheHelper to Toolkit. r=standard8

The OfflineAppCacheHelper was apparently introduced after the Sanitizer had been
forked for Fennec and so far nobody bothered to use it there as well.

MozReview-Commit-ID: 42Uk5hfvf9y

--HG--
rename : browser/modules/offlineAppCache.jsm => toolkit/modules/offlineAppCache.jsm
extra : rebase_source : 77e542dbbdfea62b918b89b4c0799be7e3f89ef9

browser/base/content/test/general/browser_offlineQuotaNotification.js

@@ -15,7 +15,7 @@ registerCleanupFunction(function() {
   Services.perms.removeFromPrincipal(principal, "offline-app");
   Services.prefs.clearUserPref("offline-apps.quota.warn");
   Services.prefs.clearUserPref("offline-apps.allow_by_default");
-  let {OfflineAppCacheHelper} = ChromeUtils.import("resource:///modules/offlineAppCache.jsm", {});
+  let {OfflineAppCacheHelper} = ChromeUtils.import("resource://gre/modules/offlineAppCache.jsm", {});
   OfflineAppCacheHelper.clear();
 });
 

browser/components/preferences/in-content/tests/siteData/head.js

@@ -15,7 +15,7 @@ const REMOVE_DIALOG_URL = "chrome://browser/content/preferences/siteDataRemoveSe
 
 const { DownloadUtils } = ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm", {});
 const { SiteDataManager } = ChromeUtils.import("resource:///modules/SiteDataManager.jsm", {});
-const { OfflineAppCacheHelper } = ChromeUtils.import("resource:///modules/offlineAppCache.jsm", {});
+const { OfflineAppCacheHelper } = ChromeUtils.import("resource://gre/modules/offlineAppCache.jsm", {});
 
 ChromeUtils.defineModuleGetter(this, "SiteDataTestUtils",
                                "resource://testing-common/SiteDataTestUtils.jsm");

browser/modules/Sanitizer.jsm

@@ -17,7 +17,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   TelemetryStopwatch: "resource://gre/modules/TelemetryStopwatch.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
   ServiceWorkerCleanUp: "resource://gre/modules/ServiceWorkerCleanUp.jsm",
-  OfflineAppCacheHelper: "resource:///modules/offlineAppCache.jsm",
+  OfflineAppCacheHelper: "resource://gre/modules/offlineAppCache.jsm",
 });
 
 XPCOMUtils.defineLazyServiceGetter(this, "sas",

browser/modules/SiteDataManager.jsm

@@ -4,7 +4,7 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 ChromeUtils.defineModuleGetter(this, "OfflineAppCacheHelper",
-                               "resource:///modules/offlineAppCache.jsm");
+                               "resource://gre/modules/offlineAppCache.jsm");
 ChromeUtils.defineModuleGetter(this, "ServiceWorkerCleanUp",
                                "resource://gre/modules/ServiceWorkerCleanUp.jsm");
 

browser/modules/moz.build

@@ -109,9 +109,6 @@ with Files("WindowsJumpLists.jsm"):
 with Files("WindowsPreviewPerTab.jsm"):
     BUG_COMPONENT = ("Core", "Widget: Win32")
 
-with Files("offlineAppCache.jsm"):
-    BUG_COMPONENT = ("Firefox", "Preferences")
-
 with Files("webrtcUI.jsm"):
     BUG_COMPONENT = ("Firefox", "Device Permissions")
 
@@ -147,7 +144,6 @@ EXTRA_JS_MODULES += [
     'FormSubmitObserver.jsm',
     'FormValidationHandler.jsm',
     'LaterRun.jsm',
-    'offlineAppCache.jsm',
     'OpenInTabsUtils.jsm',
     'PageActions.jsm',
     'PermissionUI.jsm',

mobile/android/modules/Sanitizer.jsm

@@ -13,6 +13,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   Downloads: "resource://gre/modules/Downloads.jsm",
   EventDispatcher: "resource://gre/modules/Messaging.jsm",
   FormHistory: "resource://gre/modules/FormHistory.jsm",
+  OfflineAppCacheHelper: "resource://gre/modules/offlineAppCache.jsm",
   OS: "resource://gre/modules/osfile.jsm",
   Task: "resource://gre/modules/Task.jsm",
   TelemetryStopwatch: "resource://gre/modules/TelemetryStopwatch.jsm",
@@ -147,10 +148,9 @@ Sanitizer.prototype = {
     offlineApps: {
       clear: function() {
         return new Promise(function(resolve, reject) {
-          var appCacheStorage = Services.cache2.appCacheStorage(Services.loadContextInfo.default, null);
-          try {
-            appCacheStorage.asyncEvictStorage(null);
-          } catch (er) {}
+          // AppCache
+          // This doesn't wait for the cleanup to be complete.
+          OfflineAppCacheHelper.clear();
 
           resolve();
         });

toolkit/modules/moz.build

@@ -106,6 +106,9 @@ with Files('NewTabUtils.jsm'):
 with Files('ObjectUtils.jsm'):
     BUG_COMPONENT = ('Toolkit', 'Telemetry')
 
+with Files("offlineAppCache.jsm"):
+    BUG_COMPONENT = ("Toolkit", "Preferences")
+
 with Files('PageMenu.jsm'):
     BUG_COMPONENT = ('Firefox', 'Menus')
 
@@ -211,6 +214,7 @@ EXTRA_JS_MODULES += [
     'NewTabUtils.jsm',
     'NLP.jsm',
     'ObjectUtils.jsm',
+    'offlineAppCache.jsm',
     'PageMenu.jsm',
     'PageMetadata.jsm',
     'PermissionsUtils.jsm',