import changes from `dev' branch of rmottola/Arctic-Fox:

- bug 1189692 - add telem for quic advertisements r=hurley (67ee0adad5)
- Bug 1167809 - Add skip size check flag to cache for use with ServiceWorkers. r=mayhemer (adb2bd10ed)
- Bug 1172697 - URLs containing  in the query or hash should not be handled as packaged app resources r=mcmanus (2f1f079ec3)
- missing unimportant bits of Bug 1166133 (08ae4d5eaa)
- Bug 1153869 - altsvc assert scheme is http or https r=hurley (fa8eb33a0f)
- Bug 1153924 - do not use altsvc with proxy r=hurley (4ebcef7ee5)
- Bug 1170837 - Add static GetPackageURI method to PackagedAppService r=honzab (3aa5ed3ba4)
- Bug 1170837 - Provide way to update packaged apps r=honzab (bba59384e3)
- Bug 1172885 - nsHttpChannel::BeginConnect must call AsyncAbort in the case of an error. r=valentin (fb1950c107)
- Bug 1187159 - Pass principal and flags from the requesting channel to the packaged app channel r=honzab (e2eee864ed)
- Bug 1181137 - Copy all headers from base channel to subresources in the packaged app. r=honzab (481f62182b)
- Bug 1165263 - Part 3: Update mozprofile to support new moz_hosts schema, r=ahal (fab842eb19)
- Bug 1091274 - Move leak log functions out of automationutils and into mozbase. r=jgriffin (58ed655e98)
- bug 1139922 - Fix loading mozinfo in runreftest.py. r=dbaron (23c57102ed)
- restore some missing bits (1027a2f538)
- Bug 1084614 - Clean up orphan servers before starting mochitests or reftests; r=kmoir (2e77777b26)
- Bug 1145364 - Use more portable ps command line for orphan cleanup; r=kmoir (c4f5964e79)
- Bug 1181521 - Reformat runreftest.py according to PEP8 rules, r=Ms2ger,jmaher (48d74f5782)
- re-apply 817007 (03c3a3e65c)
- Bug 1165263 - Part 4: Update reftest runners to support new moz_hosts schema, r=dbaron (3635819ff3)
- Bug 1182487 - Add test for opening the channel with nsIRequest::INHIBIT_CACHING flag set. r=michal (4de157a608)
- Bug 1190502 - RESOLVE_DISABLE_IPV4 returns A records r=mcmanus (0fbbe65166)
- Bug 1172701 - Make GetSubresourceURI normalize the path for packaged resources r=mcmanus (aa8baa740d)
- Bug 1144806, Fix test_temporary_storage to not depend on database sizes. r=bent. (653584241a)
- Bug 1153896 - dont setup altsvc for same host/port as origin r=hurley (7294b622d7)
- Bug 1170066 - Fix -Wunreachable-code-return clang warning in netwerk/protocol/http/. r=mcmanus (b0775af93d)

netwerk/cache2/CacheStorageService.cpp

@@ -681,7 +681,7 @@ NS_IMETHODIMP CacheStorageService::MemoryCacheStorage(nsILoadContextInfo *aLoadC
 
   nsCOMPtr<nsICacheStorage> storage;
   if (CacheObserver::UseNewCache()) {
-    storage = new CacheStorage(aLoadContextInfo, false, false);
+    storage = new CacheStorage(aLoadContextInfo, false, false, false);
   }
   else {
     storage = new _OldStorage(aLoadContextInfo, false, false, false, nullptr);
@@ -706,7 +706,7 @@ NS_IMETHODIMP CacheStorageService::DiskCacheStorage(nsILoadContextInfo *aLoadCon
 
   nsCOMPtr<nsICacheStorage> storage;
   if (CacheObserver::UseNewCache()) {
-    storage = new CacheStorage(aLoadContextInfo, useDisk, aLookupAppCache);
+    storage = new CacheStorage(aLoadContextInfo, useDisk, aLookupAppCache, false);
   }
   else {
     storage = new _OldStorage(aLoadContextInfo, useDisk, aLookupAppCache, false, nullptr);
@@ -737,6 +737,24 @@ NS_IMETHODIMP CacheStorageService::AppCacheStorage(nsILoadContextInfo *aLoadCont
   return NS_OK;
 }
 
+NS_IMETHODIMP CacheStorageService::SynthesizedCacheStorage(nsILoadContextInfo *aLoadContextInfo,
+                                                           nsICacheStorage * *_retval)
+{
+  NS_ENSURE_ARG(aLoadContextInfo);
+  NS_ENSURE_ARG(_retval);
+
+  nsCOMPtr<nsICacheStorage> storage;
+  if (CacheObserver::UseNewCache()) {
+    storage = new CacheStorage(aLoadContextInfo, false, false, true /* skip size checks for synthesized cache */);
+  }
+  else {
+    storage = new _OldStorage(aLoadContextInfo, false, false, false, nullptr);
+  }
+
+  storage.forget(_retval);
+  return NS_OK;
+}
+
 NS_IMETHODIMP CacheStorageService::Clear()
 {
   nsresult rv;
@@ -1335,7 +1353,8 @@ CacheStorageService::AddStorageEntry(CacheStorage const* aStorage,
   CacheFileUtils::AppendKeyPrefix(aStorage->LoadInfo(), contextKey);
 
   return AddStorageEntry(contextKey, aURI, aIdExtension,
-                         aStorage->WriteToDisk(), aCreateIfNotExist, aReplace,
+                         aStorage->WriteToDisk(), aStorage->SkipSizeCheck(),
+                         aCreateIfNotExist, aReplace,
                          aResult);
 }
 
@@ -1344,6 +1363,7 @@ CacheStorageService::AddStorageEntry(nsCSubstring const& aContextKey,
                                      nsIURI* aURI,
                                      const nsACString & aIdExtension,
                                      bool aWriteToDisk,
+                                     bool aSkipSizeCheck,
                                      bool aCreateIfNotExist,
                                      bool aReplace,
                                      CacheEntryHandle** aResult)
@@ -1406,7 +1426,7 @@ CacheStorageService::AddStorageEntry(nsCSubstring const& aContextKey,
     // Ensure entry for the particular URL, if not read/only
     if (!entryExists && (aCreateIfNotExist || aReplace)) {
       // Entry is not in the hashtable or has just been truncated...
-      entry = new CacheEntry(aContextKey, aURI, aIdExtension, aWriteToDisk);
+      entry = new CacheEntry(aContextKey, aURI, aIdExtension, aWriteToDisk, aSkipSizeCheck);
       entries->Put(entryKey, entry);
       LOG(("  new entry %p for %s", entry.get(), entryKey.get()));
     }