From ca2d9c527673029e277f5abf223b45827ce15d2c Mon Sep 17 00:00:00 2001
From: CEL Dev Team <cel-dev@google.com>
Date: Mon, 19 Oct 2026 23:06:33 -0700
Subject: [PATCH] No public description

PiperOrigin-RevId: 1002852300
---
 .../cel_proto_wrap_value_to_message_test.cc   | 30 +++++++------------
 eval/public/structs/cel_proto_wrapper_test.cc | 24 +++++----------
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/eval/public/structs/cel_proto_wrap_value_to_message_test.cc b/eval/public/structs/cel_proto_wrap_value_to_message_test.cc
index c05d1203d..40b9398e2 100644
--- a/eval/public/structs/cel_proto_wrap_value_to_message_test.cc
+++ b/eval/public/structs/cel_proto_wrap_value_to_message_test.cc
@@ -411,10 +411,8 @@ TEST_F(CelProtoWrapValueToMessageTest, WrapStruct) {
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateString(CelValue::StringHolder(&kField1)),
        CelValue::CreateBool(true)}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
 
   Value json;
@@ -431,10 +429,8 @@ TEST_F(CelProtoWrapValueToMessageTest, WrapStruct) {
 TEST_F(CelProtoWrapValueToMessageTest, WrapFailureStructBadKeyType) {
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateInt64(1L), CelValue::CreateBool(true)}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
 
   Value json;
@@ -447,10 +443,8 @@ TEST_F(CelProtoWrapValueToMessageTest, WrapFailureStructBadValueType) {
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateString(CelValue::StringHolder(&kField1)),
        MessageToCelValue(&bad_value)}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
   Value json;
   ExpectNotWrapped(cel_value, json);
@@ -522,10 +516,8 @@ TEST_F(CelProtoWrapValueToMessageTest, WrapMapWithFieldMaskToAny) {
 
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateString(CelValue::StringHolder(&kField)), value}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   CelValue cel_value = CelValue::CreateMap(cel_map.get());
 
   Struct expected_struct;
@@ -581,10 +573,8 @@ TEST_F(CelProtoWrapValueToMessageTest, WrapMapWithEmptyToAny) {
 
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateString(CelValue::StringHolder(&kField)), value}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
 
   Struct expected_struct;
diff --git a/eval/public/structs/cel_proto_wrapper_test.cc b/eval/public/structs/cel_proto_wrapper_test.cc
index 597943f7a..e38dcaa55 100644
--- a/eval/public/structs/cel_proto_wrapper_test.cc
+++ b/eval/public/structs/cel_proto_wrapper_test.cc
@@ -827,10 +827,8 @@ TEST_F(CelProtoWrapperTest, WrapStruct) {
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateString(CelValue::StringHolder(&kField1)),
        CelValue::CreateBool(true)}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
 
   Value json;
@@ -861,10 +859,8 @@ TEST_F(CelProtoWrapperTest, WrapMapWithEmptyToAny) {
 
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateString(CelValue::StringHolder(&kField)), value}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
 
   Struct expected_struct;
@@ -894,10 +890,8 @@ TEST_F(CelProtoWrapperTest, WrapListWithEmptyToAny) {
 TEST_F(CelProtoWrapperTest, WrapFailureStructBadKeyType) {
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateInt64(1L), CelValue::CreateBool(true)}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
 
   Value json;
@@ -910,10 +904,8 @@ TEST_F(CelProtoWrapperTest, WrapFailureStructBadValueType) {
   std::vector<std::pair<CelValue, CelValue>> args = {
       {CelValue::CreateString(CelValue::StringHolder(&kField1)),
        CelProtoWrapper::CreateMessage(&bad_value, arena())}};
-  ASSERT_OK_AND_ASSIGN(
-      std::unique_ptr<CelMap> cel_map,
-      CreateContainerBackedMap(
-          absl::Span<std::pair<CelValue, CelValue>>(args.data(), args.size())));
+  ASSERT_OK_AND_ASSIGN(std::unique_ptr<CelMap> cel_map,
+                       CreateContainerBackedMap(absl::MakeSpan(args)));
   auto cel_value = CelValue::CreateMap(cel_map.get());
   Value json;
   ExpectNotWrapped(cel_value, json);