From f9b7740fc8e5f399531f1257812d309ebe478b5f Mon Sep 17 00:00:00 2001 From: serge-sans-paille Date: Mon, 27 Feb 2023 13:43:01 +0000 Subject: [PATCH] Bug 1818446 - Make caps/tests/gtest buildable outside of a unified build environment r=andi Depends on D170728 Differential Revision: https://phabricator.services.mozilla.com/D170729 --- caps/tests/gtest/TestPrincipalSerialization.cpp | 4 ++-- caps/tests/gtest/moz.build | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/caps/tests/gtest/TestPrincipalSerialization.cpp b/caps/tests/gtest/TestPrincipalSerialization.cpp index 8128f872113d..159cf1c26962 100644 --- a/caps/tests/gtest/TestPrincipalSerialization.cpp +++ b/caps/tests/gtest/TestPrincipalSerialization.cpp @@ -119,7 +119,7 @@ TEST(PrincipalSerialization, ExpandedPrincipal) BasePrincipal::eContentPrincipal); allowedDomains[1] = principal2; - OriginAttributes attrs; + mozilla::OriginAttributes attrs; RefPtr result = ExpandedPrincipal::Create(allowedDomains, attrs); ASSERT_EQ(BasePrincipal::Cast(result)->Kind(), @@ -177,7 +177,7 @@ TEST(PrincipalSerialization, ExpandedPrincipalOA) BasePrincipal::eContentPrincipal); allowedDomains[1] = principal2; - OriginAttributes attrs; + mozilla::OriginAttributes attrs; nsAutoCString suffix("^userContextId=1"); bool ok = attrs.PopulateFromSuffix(suffix); ASSERT_TRUE(ok); diff --git a/caps/tests/gtest/moz.build b/caps/tests/gtest/moz.build index e65c3bce750c..10b1a66f3b94 100644 --- a/caps/tests/gtest/moz.build +++ b/caps/tests/gtest/moz.build @@ -16,5 +16,3 @@ UNIFIED_SOURCES += [ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul-gtest" - -REQUIRES_UNIFIED_BUILD = True