Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1874223 - Remove Scoped.h use from dom/quota/test. r=dom-storage-reviewers,asuth

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D198296
This commit is contained in:
Kelsey Gilbert 2024-01-29 17:58:37 +00:00
parent e6cdcbb9e5
commit 5a4700e141
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dom/quota/test/gtest/TestEncryptedStream.cpp
View File

@ -23,7 +23,6 @@
#include "mozilla/FixedBufferOutputStream.h"
#include "mozilla/NotNull.h"
#include "mozilla/RefPtr.h"
#include "mozilla/Scoped.h"
#include "mozilla/Span.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/dom/SafeRefPtr.h"
@ -229,12 +228,6 @@ NS_IMETHODIMP ArrayBufferInputStream::Clone(nsIInputStream** _retval) {
}
} // namespace mozilla::dom::quota
namespace mozilla {
MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedNSSContext, NSSInitContext,
NSS_ShutdownContext);
} // namespace mozilla
using namespace mozilla;
using namespace mozilla::dom::quota;
@ -243,18 +236,22 @@ class DOM_Quota_EncryptedStream : public ::testing::Test {
static void SetUpTestCase() {
// Do this only once, do not tear it down per test case.
if (!sNssContext) {
sNssContext =
sNssContext.reset(
NSS_InitContext("", "", "", "", nullptr,
NSS_INIT_READONLY | NSS_INIT_NOCERTDB |
NSS_INIT_NOMODDB | NSS_INIT_FORCEOPEN |
NSS_INIT_OPTIMIZESPACE | NSS_INIT_NOROOTINIT);
NSS_INIT_OPTIMIZESPACE | NSS_INIT_NOROOTINIT));
}
}
static void TearDownTestCase() { sNssContext = nullptr; }
private:
inline static ScopedNSSContext sNssContext = ScopedNSSContext{};
struct NSSInitContextDeleter {
void operator()(NSSInitContext* p) { NSS_ShutdownContext(p); }
};
inline static std::unique_ptr<NSSInitContext, NSSInitContextDeleter>
sNssContext;
};
enum struct FlushMode { AfterEachChunk, Never };

16
dom/quota/test/gtest/TestStorageConnection.cpp
View File

@ -8,7 +8,6 @@
#include "mozIStorageConnection.h"
#include "mozIStorageService.h"
#include "mozStorageCID.h"
#include "mozilla/Scoped.h"
#include "mozilla/dom/quota/IPCStreamCipherStrategy.h"
#include "mozilla/dom/quota/QuotaCommon.h"
#include "mozilla/dom/quota/QuotaManager.h"
@ -22,8 +21,9 @@
namespace mozilla {
MOZ_TYPE_SPECIFIC_SCOPED_POINTER_TEMPLATE(ScopedNSSContext, NSSInitContext,
NSS_ShutdownContext);
struct NSSInitContextDeleter {
void operator()(NSSInitContext* p) { NSS_ShutdownContext(p); }
};
namespace dom::quota::test {
@ -165,11 +165,11 @@ class TestStorageConnection : public QuotaManagerDependencyFixture {
static void SetUpTestCase() {
// Do this only once, do not tear it down per test case.
if (!sNssContext) {
sNssContext =
sNssContext.reset(
NSS_InitContext("", "", "", "", nullptr,
NSS_INIT_READONLY | NSS_INIT_NOCERTDB |
NSS_INIT_NOMODDB | NSS_INIT_FORCEOPEN |
NSS_INIT_OPTIMIZESPACE | NSS_INIT_NOROOTINIT);
NSS_INIT_OPTIMIZESPACE | NSS_INIT_NOROOTINIT));
}
ASSERT_NO_FATAL_FAILURE(InitializeFixture());
@ -186,7 +186,11 @@ class TestStorageConnection : public QuotaManagerDependencyFixture {
}
private:
inline static ScopedNSSContext sNssContext = ScopedNSSContext{};
struct NSSInitContextDeleter {
void operator()(NSSInitContext* p) { NSS_ShutdownContext(p); }
};
inline static std::unique_ptr<NSSInitContext, NSSInitContextDeleter>
sNssContext;
};
TEST_F(TestStorageConnection, BaseVFS) {