Bug 1766768 - Fix move constructor of OwningNonNull(RefPtr<>&&) to ac…

…tually move. r=mccr8

Differential Revision: https://phabricator.services.mozilla.com/D144987

xpcom/base/OwningNonNull.h

@@ -159,7 +159,7 @@ class MOZ_IS_SMARTPTR_TO_REFCOUNTED OwningNonNull {
  protected:
   template <typename U>
   void init(U&& aValue) {
-    mPtr = aValue;
+    mPtr = std::move(aValue);
     MOZ_ASSERT(mPtr);
 #ifdef DEBUG
     mInited = true;

xpcom/tests/gtest/TestOwningNonNull.cpp

@@ -0,0 +1,27 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* 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 "mozilla/OwningNonNull.h"
+#include "mozilla/RefCounted.h"
+#include "mozilla/RefPtr.h"
+#include "gtest/gtest.h"
+
+using namespace mozilla;
+
+struct OwnedRefCounted : public RefCounted<OwnedRefCounted> {
+  MOZ_DECLARE_REFCOUNTED_TYPENAME(OwnedRefCounted)
+
+  OwnedRefCounted() = default;
+
+ private:
+  ~OwnedRefCounted() = default;
+};
+
+TEST(OwningNonNull, Move)
+{
+  auto refptr = MakeRefPtr<OwnedRefCounted>();
+  OwningNonNull<OwnedRefCounted> owning(std::move(refptr));
+  EXPECT_FALSE(!!refptr);
+}

xpcom/tests/gtest/moz.build

@@ -39,6 +39,7 @@ UNIFIED_SOURCES += [
     "TestNSPRLogModulesParser.cpp",
     "TestObserverArray.cpp",
     "TestObserverService.cpp",
+    "TestOwningNonNull.cpp",
     "TestPLDHash.cpp",
     "TestPriorityQueue.cpp",
     "TestQueue.cpp",