From 0df92fdb83d75d30cfcc7e25b30675620b55ed29 Mon Sep 17 00:00:00 2001 From: Alexis Beingessner Date: Thu, 18 Feb 2021 13:26:33 +0000 Subject: [PATCH] Bug 1686616 - make CacheStorage use Components instead of Services. r=kmag,necko-reviewers,valentin Differential Revision: https://phabricator.services.mozilla.com/D105532 --- netwerk/protocol/http/nsHttpChannel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 15cc7bdbd414..f7320403cb91 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -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 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 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 cacheStorageService( - services::GetCacheStorageService()); + components::CacheStorage::Service()); rv = cacheStorageService ? NS_OK : NS_ERROR_FAILURE; nsCOMPtr cacheStorage;