Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 0 insertions, 20 deletions

diff --git a/browser/modules/offlineAppCache.jsm b/browser/modules/offlineAppCache.jsm
deleted file mode 100644
index 5d0e3481a..000000000
--- a/browser/modules/offlineAppCache.jsm
+++ /dev/null
@@ -1,20 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-this.EXPORTED_SYMBOLS = ["OfflineAppCacheHelper"];
-
-Components.utils.import('resource://gre/modules/LoadContextInfo.jsm');
-
-const Cc = Components.classes;
-const Ci = Components.interfaces;
-
-this.OfflineAppCacheHelper = {
-  clear: function() {
-    var cacheService = Cc["@mozilla.org/netwerk/cache-storage-service;1"].getService(Ci.nsICacheStorageService);
-    var appCacheStorage = cacheService.appCacheStorage(LoadContextInfo.default, null);
-    try {
-      appCacheStorage.asyncEvictStorage(null);
-    } catch (er) {}
-  }
-};