зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1547114 - Part 3: Remove nsCookiePermission::mThirdPartyUtil; r=baku
Differential Revision: https://phabricator.services.mozilla.com/D28916 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
ee308fca8a
Коммит
2fbc24f3bc
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
Загрузка…
Ссылка в новой задаче