Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 18:47:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1547114 - Part 3: Remove nsCookiePermission::mThirdPartyUtil; r=baku

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D28916

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Ehsan Akhgari 2019-04-26 15:49:21 +00:00
parent ee308fca8a
commit 2fbc24f3bc
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/cookie/nsCookiePermission.cpp
View File

@ -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;
}

7
extensions/cookie/nsCookiePermission.h
View File

@ -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<nsIPermissionManager> mPermMgr;
nsCOMPtr<mozIThirdPartyUtil> mThirdPartyUtil;
};
#endif