From 2fbc24f3bc6af4360990546a5c1e52c67656e6ed Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 26 Apr 2019 15:49:21 +0000 Subject: [PATCH] Bug 1547114 - Part 3: Remove nsCookiePermission::mThirdPartyUtil; r=baku Differential Revision: https://phabricator.services.mozilla.com/D28916 --HG-- extra : moz-landing-system : lando --- extensions/cookie/nsCookiePermission.cpp | 3 --- extensions/cookie/nsCookiePermission.h | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/extensions/cookie/nsCookiePermission.cpp b/extensions/cookie/nsCookiePermission.cpp index 37a420e13a72..6ab38873b990 100644 --- a/extensions/cookie/nsCookiePermission.cpp +++ b/extensions/cookie/nsCookiePermission.cpp @@ -6,7 +6,6 @@ #include "nsCookiePermission.h" -#include "mozIThirdPartyUtil.h" #include "nsICookie2.h" #include "nsIServiceManager.h" #include "nsICookieManager.h" @@ -60,8 +59,6 @@ bool nsCookiePermission::Init() { nsresult rv; mPermMgr = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv); if (NS_FAILED(rv)) return false; - mThirdPartyUtil = do_GetService(THIRDPARTYUTIL_CONTRACTID, &rv); - if (NS_FAILED(rv)) return false; return true; } diff --git a/extensions/cookie/nsCookiePermission.h b/extensions/cookie/nsCookiePermission.h index 852645059732..8217327ce6f1 100644 --- a/extensions/cookie/nsCookiePermission.h +++ b/extensions/cookie/nsCookiePermission.h @@ -8,8 +8,6 @@ #include "nsICookiePermission.h" #include "nsIPermissionManager.h" #include "nsCOMPtr.h" -#include "mozIThirdPartyUtil.h" - class nsCookiePermission final : public nsICookiePermission { public: @@ -25,12 +23,9 @@ class nsCookiePermission final : public nsICookiePermission { private: ~nsCookiePermission() = default; - bool EnsureInitialized() { - return (mPermMgr != nullptr && mThirdPartyUtil != nullptr) || Init(); - }; + bool EnsureInitialized() { return (mPermMgr != nullptr) || Init(); }; nsCOMPtr mPermMgr; - nsCOMPtr mThirdPartyUtil; }; #endif