diff --git a/xpcom/tests/gtest/TestMozPromise.cpp b/xpcom/tests/gtest/TestMozPromise.cpp index e4936cfb4bba..07c6f1aa3c91 100644 --- a/xpcom/tests/gtest/TestMozPromise.cpp +++ b/xpcom/tests/gtest/TestMozPromise.cpp @@ -247,7 +247,7 @@ TEST(MozPromise, PromiseAllResolve) TestPromise::All(queue, promises) ->Then( queue, __func__, - [queue](const nsTArray& aResolveValues) -> void { + [queue](const CopyableTArray& aResolveValues) -> void { EXPECT_EQ(aResolveValues.Length(), 3UL); EXPECT_EQ(aResolveValues[0], 22); EXPECT_EQ(aResolveValues[1], 32); diff --git a/xpcom/threads/MozPromise.h b/xpcom/threads/MozPromise.h index 84654e7d509a..8e4cd8b01f1c 100644 --- a/xpcom/threads/MozPromise.h +++ b/xpcom/threads/MozPromise.h @@ -284,7 +284,8 @@ class MozPromise : public MozPromiseBase { return p; } - typedef MozPromise, RejectValueType, IsExclusive> + typedef MozPromise, RejectValueType, + IsExclusive> AllPromiseType; private: @@ -341,8 +342,8 @@ class MozPromise : public MozPromiseBase { nsISerialEventTarget* aProcessingTarget, nsTArray>& aPromises) { if (aPromises.Length() == 0) { - return AllPromiseType::CreateAndResolve(nsTArray(), - __func__); + return AllPromiseType::CreateAndResolve( + CopyableTArray(), __func__); } RefPtr holder = new AllPromiseHolder(aPromises.Length());