Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_dom_performance-resource-timing_1

4 files changed, 0 insertions, 131 deletions

diff --git a/security/nss/gtests/util_gtest/manifest.mn b/security/nss/gtests/util_gtest/manifest.mn
index a90e8431e..edede657f 100644
--- a/security/nss/gtests/util_gtest/manifest.mn
+++ b/security/nss/gtests/util_gtest/manifest.mn
@@ -10,8 +10,6 @@ CPPSRCS = \
 	util_utf8_unittest.cc \
 	util_b64_unittest.cc \
 	util_pkcs11uri_unittest.cc \
-	util_aligned_malloc_unittest.cc \
-	util_memcmpzero_unittest.cc \
 	$(NULL)
 
 INCLUDES += \
diff --git a/security/nss/gtests/util_gtest/util_aligned_malloc_unittest.cc b/security/nss/gtests/util_gtest/util_aligned_malloc_unittest.cc
deleted file mode 100644
index 9745ca7d3..000000000
--- a/security/nss/gtests/util_gtest/util_aligned_malloc_unittest.cc
+++ /dev/null
@@ -1,82 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "gtest/gtest.h"
-#include "scoped_ptrs_util.h"
-
-namespace nss_test {
-
-struct SomeContext {
-  uint8_t some_buf[13];
-  void *mem;
-};
-
-template <class T>
-struct ScopedDelete {
-  void operator()(T *ptr) {
-    if (ptr) {
-      PORT_Free(ptr->mem);
-    }
-  }
-};
-typedef std::unique_ptr<SomeContext, ScopedDelete<SomeContext> >
-    ScopedSomeContext;
-
-class AlignedMallocTest : public ::testing::Test,
-                          public ::testing::WithParamInterface<size_t> {
- protected:
-  ScopedSomeContext test_align_new(size_t alignment) {
-    ScopedSomeContext ctx(PORT_ZNewAligned(SomeContext, alignment, mem));
-    return ctx;
-  };
-  ScopedSomeContext test_align_alloc(size_t alignment) {
-    void *mem = nullptr;
-    ScopedSomeContext ctx((SomeContext *)PORT_ZAllocAligned(sizeof(SomeContext),
-                                                            alignment, &mem));
-    if (ctx) {
-      ctx->mem = mem;
-    }
-    return ctx;
-  }
-};
-
-TEST_P(AlignedMallocTest, TestNew) {
-  size_t alignment = GetParam();
-  ScopedSomeContext ctx = test_align_new(alignment);
-  EXPECT_TRUE(ctx.get());
-  EXPECT_EQ(0U, (uintptr_t)ctx.get() % alignment);
-}
-
-TEST_P(AlignedMallocTest, TestAlloc) {
-  size_t alignment = GetParam();
-  ScopedSomeContext ctx = test_align_alloc(alignment);
-  EXPECT_TRUE(ctx.get());
-  EXPECT_EQ(0U, (uintptr_t)ctx.get() % alignment);
-}
-
-class AlignedMallocTestBadSize : public AlignedMallocTest {};
-
-TEST_P(AlignedMallocTestBadSize, TestNew) {
-  size_t alignment = GetParam();
-  ScopedSomeContext ctx = test_align_new(alignment);
-  EXPECT_FALSE(ctx.get());
-}
-
-TEST_P(AlignedMallocTestBadSize, TestAlloc) {
-  size_t alignment = GetParam();
-  ScopedSomeContext ctx = test_align_alloc(alignment);
-  EXPECT_FALSE(ctx.get());
-}
-
-static const size_t kSizes[] = {1, 2, 4, 8, 16, 32, 64};
-static const size_t kBadSizes[] = {0, 7, 17, 24, 56};
-
-INSTANTIATE_TEST_CASE_P(AllAligned, AlignedMallocTest,
-                        ::testing::ValuesIn(kSizes));
-INSTANTIATE_TEST_CASE_P(AllAlignedBadSize, AlignedMallocTestBadSize,
-                        ::testing::ValuesIn(kBadSizes));
-
-}  // namespace nss_test
diff --git a/security/nss/gtests/util_gtest/util_gtest.gyp b/security/nss/gtests/util_gtest/util_gtest.gyp
index 1c54329b2..7abd71b2f 100644
--- a/security/nss/gtests/util_gtest/util_gtest.gyp
+++ b/security/nss/gtests/util_gtest/util_gtest.gyp
@@ -14,8 +14,6 @@
         'util_utf8_unittest.cc',
         'util_b64_unittest.cc',
         'util_pkcs11uri_unittest.cc',
-        'util_aligned_malloc_unittest.cc',
-        'util_memcmpzero_unittest.cc',
         '<(DEPTH)/gtests/common/gtests.cc',
       ],
       'dependencies': [
diff --git a/security/nss/gtests/util_gtest/util_memcmpzero_unittest.cc b/security/nss/gtests/util_gtest/util_memcmpzero_unittest.cc
deleted file mode 100644
index 29cac3f67..000000000
--- a/security/nss/gtests/util_gtest/util_memcmpzero_unittest.cc
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "gtest/gtest.h"
-#include "scoped_ptrs_util.h"
-
-namespace nss_test {
-
-class MemcmpZeroTest : public ::testing::Test {
- protected:
-  unsigned int test_memcmp_zero(const std::vector<uint8_t> &mem) {
-    return NSS_SecureMemcmpZero(mem.data(), mem.size());
-  };
-};
-
-TEST_F(MemcmpZeroTest, TestMemcmpZeroTrue) {
-  unsigned int rv = test_memcmp_zero(std::vector<uint8_t>(37, 0));
-  EXPECT_EQ(0U, rv);
-}
-
-TEST_F(MemcmpZeroTest, TestMemcmpZeroFalse5) {
-  std::vector<uint8_t> vec(37, 0);
-  vec[5] = 1;
-  unsigned int rv = test_memcmp_zero(vec);
-  EXPECT_NE(0U, rv);
-}
-
-TEST_F(MemcmpZeroTest, TestMemcmpZeroFalse37) {
-  std::vector<uint8_t> vec(37, 0);
-  vec[vec.size() - 1] = 0xFF;
-  unsigned int rv = test_memcmp_zero(vec);
-  EXPECT_NE(0U, rv);
-}
-
-TEST_F(MemcmpZeroTest, TestMemcmpZeroFalse0) {
-  std::vector<uint8_t> vec(37, 0);
-  vec[0] = 1;
-  unsigned int rv = test_memcmp_zero(vec);
-  EXPECT_NE(0U, rv);
-}
-
-}  // namespace nss_test