1 files changed, 15 insertions, 12 deletions
diff --git a/ipc/ipdl/test/gtest/TestUniquePtrIPC.cpp b/ipc/ipdl/test/gtest/TestUniquePtrIPC.cpp
index 52ca322f8e..b3c68b99b4 100644
--- a/ipc/ipdl/test/gtest/TestUniquePtrIPC.cpp
+++ b/ipc/ipdl/test/gtest/TestUniquePtrIPC.cpp
@@ -26,18 +26,20 @@ class TestUniquePtrIPCParent : public PTestUniquePtrIPCParent {
 class TestUniquePtrIPCChild : public PTestUniquePtrIPCChild {
   NS_INLINE_DECL_REFCOUNTING(TestUniquePtrIPCChild, override)
  private:
-  IPCResult RecvTestMessage(const UniquePtr<int>& aA1,
+  IPCResult RecvTestMessage(const UniquePtr<std::string>& aA1,
                             const UniquePtr<DummyStruct>& aA2,
                             const DummyStruct& aA3,
-                            const UniquePtr<int>& aA4) final override {
+                            const UniquePtr<std::string>& aA4,
+                            const DummyUnion& aA5) final override {
     EXPECT_TRUE(aA1) << "TestMessage received NULL aA1";
     EXPECT_TRUE(aA2) << "TestMessage received NULL aA2";
     EXPECT_FALSE(aA4)
         << "TestMessage received non-NULL when expecting NULL aA4";
 
-    EXPECT_EQ(*aA1, 1);
-    EXPECT_EQ(aA2->x(), 2);
-    EXPECT_EQ(aA3.x(), 3);
+    EXPECT_EQ(*aA1, std::string("unique"));
+    EXPECT_EQ(aA2->x(), std::string("uniqueStruct"));
+    EXPECT_EQ(aA3.x(), std::string("struct"));
+    EXPECT_EQ(*aA5.get_string(), std::string("union"));
 
     return IPC_OK();
   }
@@ -45,7 +47,7 @@ class TestUniquePtrIPCChild : public PTestUniquePtrIPCChild {
   IPCResult RecvTestSendReference(
       const UniquePtr<DummyStruct>& aA) final override {
     EXPECT_TRUE(aA) << "TestSendReference received NULL item in child";
-    EXPECT_EQ(aA->x(), 1);
+    EXPECT_EQ(aA->x(), std::string("reference"));
 
     Close();
     return IPC_OK();
@@ -55,12 +57,13 @@ class TestUniquePtrIPCChild : public PTestUniquePtrIPCChild {
 };
 
 IPDL_TEST(TestUniquePtrIPC) {
-  UniquePtr<int> a1 = MakeUnique<int>(1);
-  UniquePtr<DummyStruct> a2 = MakeUnique<DummyStruct>(2);
-  DummyStruct a3(3);
-  UniquePtr<int> a4;
+  UniquePtr<std::string> a1 = MakeUnique<std::string>("unique");
+  UniquePtr<DummyStruct> a2 = MakeUnique<DummyStruct>("uniqueStruct");
+  DummyStruct a3("struct");
+  UniquePtr<std::string> a4;
+  DummyUnion a5(MakeUnique<std::string>("union"));
 
-  EXPECT_TRUE(mActor->SendTestMessage(a1, a2, a3, a4));
+  EXPECT_TRUE(mActor->SendTestMessage(a1, a2, a3, a4, a5));
 
   EXPECT_TRUE(a1)
       << "IPC arguments are passed by const reference and shouldn't be moved";
@@ -70,7 +73,7 @@ IPDL_TEST(TestUniquePtrIPC) {
   EXPECT_FALSE(a4) << "somehow turned null ptr into non-null by sending it";
 
   // Pass UniquePtr by reference
-  UniquePtr<DummyStruct> b = MakeUnique<DummyStruct>(1);
+  UniquePtr<DummyStruct> b = MakeUnique<DummyStruct>("reference");
 
   EXPECT_TRUE(mActor->SendTestSendReference(b));
   EXPECT_TRUE(b)