From e5064882f1a6d2c55649957b1bcc22d3a1949861 Mon Sep 17 00:00:00 2001
From: SpockMan02 <aidanboyle@comcast.net>
Date: Sun, 5 Aug 2018 04:08:37 -0700
Subject: Issue #686: Un-deprecate the Application Cache API

---
 netwerk/protocol/http/nsHttpChannel.cpp | 23 -----------------------
 netwerk/protocol/http/nsHttpChannel.h   |  2 --
 2 files changed, 25 deletions(-)

(limited to 'netwerk')

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;
     }
 
@@ -8186,21 +8178,6 @@ nsHttpChannel::ResumeInternal()
     return NS_FAILED(rvTransaction) ? rvTransaction : rvCache;
 }
 
-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:
-- 
cgit v1.2.3