commit 90a2ddc4d68bcd50397663f26fbed7a4dd97daec
author Protobuf Team Bot <protobuf-github-bot@google.com> Tue Sep 02 19:57:00 2025 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Sep 02 21:47:11 2025 -0700
tree fb18c3e02620329b63dc38e48a5c81afe62e6919
parent 65e1331d74b86002ac7dd4a149d6c96ecb76c5b1

Automated Code Change

PiperOrigin-RevId: 802371354

src/google/protobuf/no_field_presence_map_test.cc

diff --git a/src/google/protobuf/no_field_presence_map_test.cc b/src/google/protobuf/no_field_presence_map_test.cc
index dae6fa8..8991d1d 100644
--- a/src/google/protobuf/no_field_presence_map_test.cc
+++ b/src/google/protobuf/no_field_presence_map_test.cc
@@ -25,15 +25,11 @@
 namespace protobuf {
 namespace {
 
-using ::proto2_nofieldpresence_unittest::ExplicitForeignMessage;
 using ::proto2_nofieldpresence_unittest::FOREIGN_BAZ;
 using ::proto2_nofieldpresence_unittest::FOREIGN_FOO;
-using ::proto2_nofieldpresence_unittest::ForeignMessage;
 using ::proto2_nofieldpresence_unittest::TestAllMapTypes;
 using ::testing::Eq;
-using ::testing::Gt;
 using ::testing::Not;
-using ::testing::StrEq;
 using ::testing::UnorderedPointwise;
 
 // Custom gmock matchers to simplify testing for map entries.

src/google/protobuf/no_field_presence_test.cc

diff --git a/src/google/protobuf/no_field_presence_test.cc b/src/google/protobuf/no_field_presence_test.cc
index 761d5b2..b0fbb46 100644
--- a/src/google/protobuf/no_field_presence_test.cc
+++ b/src/google/protobuf/no_field_presence_test.cc
@@ -34,7 +34,6 @@
 using ::testing::Eq;
 using ::testing::Gt;
 using ::testing::IsEmpty;
-using ::testing::Not;
 using ::testing::StrEq;
 using ::testing::UnorderedPointwise;
 

src/google/protobuf/repeated_ptr_field_unittest.cc

diff --git a/src/google/protobuf/repeated_ptr_field_unittest.cc b/src/google/protobuf/repeated_ptr_field_unittest.cc
index a17eb39..94eb136 100644
--- a/src/google/protobuf/repeated_ptr_field_unittest.cc
+++ b/src/google/protobuf/repeated_ptr_field_unittest.cc
@@ -168,7 +168,7 @@
   // calls here.
   RepeatedPtrField<std::string> field;
   for (int i = 0; i < 32; i++) {
-    *field.Add() = std::string("abcdefghijklmnopqrstuvwxyz0123456789");
+    *field.Add() = "abcdefghijklmnopqrstuvwxyz0123456789";
   }
   EXPECT_EQ(32, field.size());
   field.Clear();

src/google/protobuf/string_view_test.cc

diff --git a/src/google/protobuf/string_view_test.cc b/src/google/protobuf/string_view_test.cc
index 9c66742..e8986c0 100644
--- a/src/google/protobuf/string_view_test.cc
+++ b/src/google/protobuf/string_view_test.cc
@@ -109,7 +109,7 @@
   const FieldDescriptor* field =
       message.GetDescriptor()->FindFieldByName("singular_string");
 
-  reflection->SetString(&message, field, std::string{STRING_PAYLOAD});
+  reflection->SetString(&message, field, STRING_PAYLOAD);
 
   EXPECT_THAT(reflection->GetString(message, field), StrEq(STRING_PAYLOAD));
   Reflection::ScratchSpace scratch;
@@ -265,9 +265,9 @@
       message.GetDescriptor()->FindFieldByName("repeated_string");
 
   // AddString().
-  reflection->AddString(&message, field, std::string{"000"});
-  reflection->AddString(&message, field, std::string{"111"});
-  reflection->AddString(&message, field, std::string{"222"});
+  reflection->AddString(&message, field, "000");
+  reflection->AddString(&message, field, "111");
+  reflection->AddString(&message, field, "222");
   {
     const auto& rep_str =
         reflection->GetRepeatedFieldRef<std::string>(message, field);
@@ -276,9 +276,9 @@
   }
 
   // SetRepeatedString().
-  reflection->SetRepeatedString(&message, field, 0, std::string{"000000"});
-  reflection->SetRepeatedString(&message, field, 1, std::string{"111111"});
-  reflection->SetRepeatedString(&message, field, 2, std::string{"222222"});
+  reflection->SetRepeatedString(&message, field, 0, "000000");
+  reflection->SetRepeatedString(&message, field, 1, "111111");
+  reflection->SetRepeatedString(&message, field, 2, "222222");
   {
     const auto& rep_str =
         reflection->GetRepeatedFieldRef<std::string>(message, field);