1 files changed, 16 insertions, 9 deletions
diff --git a/chromium/net/cookies/cookie_partition_key_unittest.cc b/chromium/net/cookies/cookie_partition_key_unittest.cc
index 8a68fcf314f..4bbb7cfdc17 100644
--- a/chromium/net/cookies/cookie_partition_key_unittest.cc
+++ b/chromium/net/cookies/cookie_partition_key_unittest.cc
@@ -3,33 +3,39 @@
 // found in the LICENSE file.
 
 #include <string>
+#include <tuple>
 
-#include "net/cookies/cookie_partition_key.h"
 #include "base/test/scoped_feature_list.h"
 #include "net/base/features.h"
 #include "net/cookies/cookie_constants.h"
+#include "net/cookies/cookie_partition_key.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
-class CookiePartitionKeyTest : public testing::TestWithParam<bool> {
+class CookiePartitionKeyTest
+    : public testing::TestWithParam<std::tuple<bool, bool>> {
  protected:
   // testing::Test
   void SetUp() override {
-    if (PartitionedCookiesEnabled())
-      scoped_feature_list_.InitAndEnableFeature(features::kPartitionedCookies);
-    testing::TestWithParam<bool>::SetUp();
+    scoped_feature_list_[0].InitWithFeatureState(features::kPartitionedCookies,
+                                                 PartitionedCookiesEnabled());
+    scoped_feature_list_[1].InitWithFeatureState(
+        features::kNoncedPartitionedCookies, NoncedPartitionedCookiesEnabled());
   }
 
-  bool PartitionedCookiesEnabled() { return GetParam(); }
+  bool PartitionedCookiesEnabled() { return std::get<0>(GetParam()); }
+  bool NoncedPartitionedCookiesEnabled() { return std::get<1>(GetParam()); }
 
  private:
-  base::test::ScopedFeatureList scoped_feature_list_;
+  base::test::ScopedFeatureList scoped_feature_list_[2];
 };
 
 INSTANTIATE_TEST_SUITE_P(/* no label */,
                          CookiePartitionKeyTest,
-                         testing::Bool());
+                         ::testing::Values(std::make_tuple(false, false),
+                                           std::make_tuple(false, true),
+                                           std::make_tuple(true, true)));
 
 TEST_P(CookiePartitionKeyTest, Serialization) {
   base::UnguessableToken nonce = base::UnguessableToken::Create();
@@ -261,7 +267,8 @@ TEST_P(CookiePartitionKeyTest, Equality_WithNonce) {
   EXPECT_NE(nonce1, nonce2);
   auto key1 = CookiePartitionKey::FromNetworkIsolationKey(
       NetworkIsolationKey(top_level_site, frame_site, &nonce1));
-  bool partitioned_cookies_enabled = PartitionedCookiesEnabled();
+  bool partitioned_cookies_enabled =
+      PartitionedCookiesEnabled() || NoncedPartitionedCookiesEnabled();
   EXPECT_EQ(partitioned_cookies_enabled, key1.has_value());
   if (!partitioned_cookies_enabled)
     return;