Bug 1686616 - make CacheStorage use Components instead of Services. r=kmag,necko-reviewers,valentin

Differential Revision: https://phabricator.services.mozilla.com/D105532
This commit is contained in:
Alexis Beingessner 2021-02-18 13:26:33 +00:00
parent 07f2f659c6
commit 0df92fdb83

View File

@ -61,7 +61,7 @@
#include "mozilla/ContentBlocking.h"
#include "mozilla/DebugOnly.h"
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
#include "mozilla/Components.h"
#include "mozilla/StaticPrefs_browser.h"
#include "mozilla/StaticPrefs_fission.h"
#include "mozilla/StaticPrefs_network.h"
@ -3682,7 +3682,7 @@ nsresult nsHttpChannel::OpenCacheEntryInternal(
nsAutoCString cacheKey;
nsCOMPtr<nsICacheStorageService> cacheStorageService(
services::GetCacheStorageService());
components::CacheStorage::Service());
if (!cacheStorageService) {
return NS_ERROR_NOT_AVAILABLE;
}
@ -5100,7 +5100,7 @@ void nsHttpChannel::MaybeCreateCacheEntryWhenRCWN() {
LOG(("nsHttpChannel::MaybeCreateCacheEntryWhenRCWN [this=%p]", this));
nsCOMPtr<nsICacheStorageService> cacheStorageService(
services::GetCacheStorageService());
components::CacheStorage::Service());
if (!cacheStorageService) {
return;
}
@ -9138,7 +9138,7 @@ void nsHttpChannel::DoInvalidateCacheEntry(nsIURI* aURI) {
LOG(("DoInvalidateCacheEntry [channel=%p key=%s]", this, key.get()));
nsCOMPtr<nsICacheStorageService> cacheStorageService(
services::GetCacheStorageService());
components::CacheStorage::Service());
rv = cacheStorageService ? NS_OK : NS_ERROR_FAILURE;
nsCOMPtr<nsICacheStorage> cacheStorage;