1 files changed, 21 insertions, 13 deletions

diff --git a/absl/strings/internal/cord_rep_crc_test.cc b/absl/strings/internal/cord_rep_crc_test.cc
index 42a9110b..3d27c33c 100644
--- a/absl/strings/internal/cord_rep_crc_test.cc
+++ b/absl/strings/internal/cord_rep_crc_test.cc
@@ -17,6 +17,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 #include "absl/base/config.h"
+#include "absl/crc/internal/crc_cord_state.h"
 #include "absl/strings/internal/cord_internal.h"
 #include "absl/strings/internal/cord_rep_test_util.h"
 
@@ -38,33 +39,40 @@ TEST(CordRepCrc, RemoveCrcWithNullptr) {
 
 #endif  // !NDEBUG && GTEST_HAS_DEATH_TEST
 
+absl::crc_internal::CrcCordState MakeCrcCordState(uint32_t crc) {
+  crc_internal::CrcCordState state;
+  state.mutable_rep()->prefix_crc.push_back(
+      crc_internal::CrcCordState::PrefixCrc(42, crc32c_t{crc}));
+  return state;
+}
+
 TEST(CordRepCrc, NewDestroy) {
   CordRep* rep = cordrep_testing::MakeFlat("Hello world");
-  CordRepCrc* crc = CordRepCrc::New(rep, 12345);
+  CordRepCrc* crc = CordRepCrc::New(rep, MakeCrcCordState(12345));
   EXPECT_TRUE(crc->refcount.IsOne());
   EXPECT_THAT(crc->child, Eq(rep));
-  EXPECT_THAT(crc->crc, Eq(12345u));
+  EXPECT_THAT(crc->crc_cord_state.Checksum(), Eq(crc32c_t{12345u}));
   EXPECT_TRUE(rep->refcount.IsOne());
   CordRepCrc::Destroy(crc);
 }
 
 TEST(CordRepCrc, NewExistingCrcNotShared) {
   CordRep* rep = cordrep_testing::MakeFlat("Hello world");
-  CordRepCrc* crc = CordRepCrc::New(rep, 12345);
-  CordRepCrc* new_crc = CordRepCrc::New(crc, 54321);
+  CordRepCrc* crc = CordRepCrc::New(rep, MakeCrcCordState(12345));
+  CordRepCrc* new_crc = CordRepCrc::New(crc, MakeCrcCordState(54321));
   EXPECT_THAT(new_crc, Eq(crc));
   EXPECT_TRUE(new_crc->refcount.IsOne());
   EXPECT_THAT(new_crc->child, Eq(rep));
-  EXPECT_THAT(new_crc->crc, Eq(54321u));
+  EXPECT_THAT(new_crc->crc_cord_state.Checksum(), Eq(crc32c_t{54321u}));
   EXPECT_TRUE(rep->refcount.IsOne());
   CordRepCrc::Destroy(new_crc);
 }
 
 TEST(CordRepCrc, NewExistingCrcShared) {
   CordRep* rep = cordrep_testing::MakeFlat("Hello world");
-  CordRepCrc* crc = CordRepCrc::New(rep, 12345);
+  CordRepCrc* crc = CordRepCrc::New(rep, MakeCrcCordState(12345));
   CordRep::Ref(crc);
-  CordRepCrc* new_crc = CordRepCrc::New(crc, 54321);
+  CordRepCrc* new_crc = CordRepCrc::New(crc, MakeCrcCordState(54321));
 
   EXPECT_THAT(new_crc, Ne(crc));
   EXPECT_TRUE(new_crc->refcount.IsOne());
@@ -72,19 +80,19 @@ TEST(CordRepCrc, NewExistingCrcShared) {
   EXPECT_FALSE(rep->refcount.IsOne());
   EXPECT_THAT(crc->child, Eq(rep));
   EXPECT_THAT(new_crc->child, Eq(rep));
-  EXPECT_THAT(crc->crc, Eq(12345u));
-  EXPECT_THAT(new_crc->crc, Eq(54321u));
+  EXPECT_THAT(crc->crc_cord_state.Checksum(), Eq(crc32c_t{12345u}));
+  EXPECT_THAT(new_crc->crc_cord_state.Checksum(), Eq(crc32c_t{54321u}));
 
   CordRep::Unref(crc);
   CordRep::Unref(new_crc);
 }
 
 TEST(CordRepCrc, NewEmpty) {
-  CordRepCrc* crc = CordRepCrc::New(nullptr, 12345);
+  CordRepCrc* crc = CordRepCrc::New(nullptr, MakeCrcCordState(12345));
   EXPECT_TRUE(crc->refcount.IsOne());
   EXPECT_THAT(crc->child, IsNull());
   EXPECT_THAT(crc->length, Eq(0u));
-  EXPECT_THAT(crc->crc, Eq(12345u));
+  EXPECT_THAT(crc->crc_cord_state.Checksum(), Eq(crc32c_t{12345u}));
   EXPECT_TRUE(crc->refcount.IsOne());
   CordRepCrc::Destroy(crc);
 }
@@ -98,7 +106,7 @@ TEST(CordRepCrc, RemoveCrcNotCrc) {
 
 TEST(CordRepCrc, RemoveCrcNotShared) {
   CordRep* rep = cordrep_testing::MakeFlat("Hello world");
-  CordRepCrc* crc = CordRepCrc::New(rep, 12345);
+  CordRepCrc* crc = CordRepCrc::New(rep, MakeCrcCordState(12345));
   CordRep* nocrc = RemoveCrcNode(crc);
   EXPECT_THAT(nocrc, Eq(rep));
   EXPECT_TRUE(rep->refcount.IsOne());
@@ -107,7 +115,7 @@ TEST(CordRepCrc, RemoveCrcNotShared) {
 
 TEST(CordRepCrc, RemoveCrcShared) {
   CordRep* rep = cordrep_testing::MakeFlat("Hello world");
-  CordRepCrc* crc = CordRepCrc::New(rep, 12345);
+  CordRepCrc* crc = CordRepCrc::New(rep, MakeCrcCordState(12345));
   CordRep::Ref(crc);
   CordRep* nocrc = RemoveCrcNode(crc);
   EXPECT_THAT(nocrc, Eq(rep));