4 files changed, 0 insertions, 28 deletions
diff --git a/dom/base/nsDeprecatedOperationList.h b/dom/base/nsDeprecatedOperationList.h
index 8fb381d9d..ea4b05289 100644
--- a/dom/base/nsDeprecatedOperationList.h
+++ b/dom/base/nsDeprecatedOperationList.h
@@ -44,7 +44,6 @@ DEPRECATED_OPERATION(PannerNodeDoppler)
 DEPRECATED_OPERATION(NavigatorGetUserMedia)
 DEPRECATED_OPERATION(WebrtcDeprecatedPrefix)
 DEPRECATED_OPERATION(RTCPeerConnectionGetStreams)
-DEPRECATED_OPERATION(AppCache)
 DEPRECATED_OPERATION(PrefixedImageSmoothingEnabled)
 DEPRECATED_OPERATION(PrefixedFullscreenAPI)
 DEPRECATED_OPERATION(LenientSetter)
diff --git a/dom/locales/en-US/chrome/dom/dom.properties b/dom/locales/en-US/chrome/dom/dom.properties
index ec0356c04..0472979d7 100644
--- a/dom/locales/en-US/chrome/dom/dom.properties
+++ b/dom/locales/en-US/chrome/dom/dom.properties
@@ -195,8 +195,6 @@ IgnoringWillChangeOverBudgetWarning=Will-change memory consumption is too high.
 HittingMaxWorkersPerDomain2=A Worker could not be started immediately because other documents in the same origin are already using the maximum number of workers. The Worker is now queued and will be started after some of the other workers have completed.
 # LOCALIZATION NOTE: Do not translate "setVelocity", "PannerNode", "AudioListener", "speedOfSound" and "dopplerFactor"
 PannerNodeDopplerWarning=Use of setVelocity on the PannerNode and AudioListener, and speedOfSound and dopplerFactor on the AudioListener are deprecated and those members will be removed. For more help https://developer.mozilla.org/en-US/docs/Web/API/AudioListener#Deprecated_features
-# LOCALIZATION NOTE: Do not translate "Application Cache API", "AppCache" and "ServiceWorker".
-AppCacheWarning=The Application Cache API (AppCache) is deprecated and will be removed at a future date.  Please consider using ServiceWorker for offline support.
 # LOCALIZATION NOTE: Do not translate "Worker".
 EmptyWorkerSourceWarning=Attempting to create a Worker from an empty source. This is probably unintentional.
 WebrtcDeprecatedPrefixWarning=WebRTC interfaces with the “moz” prefix (mozRTCPeerConnection, mozRTCSessionDescription, mozRTCIceCandidate) have been deprecated.
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index ac855b478..d7247eeab 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3372,10 +3372,6 @@ nsHttpChannel::ContinueProcessFallback(nsresult rv)
     }
     NS_ENSURE_SUCCESS(rv, rv);
 
-    if (mLoadFlags & LOAD_INITIAL_DOCUMENT_URI) {
-        MaybeWarnAboutAppCache();
-    }
-
     // close down this channel
     Cancel(NS_BINDING_REDIRECTED);
 
@@ -4261,10 +4257,6 @@ nsHttpChannel::OnOfflineCacheEntryAvailable(nsICacheEntry *aEntry,
         mCacheEntry = aEntry;
         mCacheEntryIsWriteOnly = false;
 
-        if (mLoadFlags & LOAD_INITIAL_DOCUMENT_URI && !mApplicationCacheForWrite) {
-            MaybeWarnAboutAppCache();
-        }
-
         return NS_OK;
     }
 
@@ -8187,21 +8179,6 @@ nsHttpChannel::ResumeInternal()
 }
 
 void
-nsHttpChannel::MaybeWarnAboutAppCache()
-{
-    // First, accumulate a telemetry ping about appcache usage.
-    Telemetry::Accumulate(Telemetry::HTTP_OFFLINE_CACHE_DOCUMENT_LOAD,
-                          true);
-
-    // Then, issue a deprecation warning.
-    nsCOMPtr<nsIDeprecationWarner> warner;
-    GetCallback(warner);
-    if (warner) {
-        warner->IssueWarning(nsIDocument::eAppCache, false);
-    }
-}
-
-void
 nsHttpChannel::SetDoNotTrack()
 {
   /**
diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h
index 3a322e8e2..2e24d6e81 100644
--- a/netwerk/protocol/http/nsHttpChannel.h
+++ b/netwerk/protocol/http/nsHttpChannel.h
@@ -452,8 +452,6 @@ private:
 
     void SetPushedStream(Http2PushedStream *stream);
 
-    void MaybeWarnAboutAppCache();
-
     void SetDoNotTrack();
 
 private: