Automated Code Change

PiperOrigin-RevId: 609013830

src/google/protobuf/compiler/cpp/copy_unittest.cc

@@ -28,7 +28,7 @@ TEST(CopyMessageTest, ArenaEnabledCopyConstructorNull) {
   protobuf_unittest::TestAllTypes message1;
   TestUtil::SetAllFields(&message1);
   protobuf_unittest::TestAllTypes* message2 =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(nullptr, message1);
+      Arena::Create<protobuf_unittest::TestAllTypes>(nullptr, message1);
   TestUtil::ExpectAllFieldsSet(*message2);
   delete message2;
 }
@@ -38,7 +38,7 @@ TEST(CopyMessageTest, ArenaEnabledCopyConstructor) {
   TestUtil::SetAllFields(&message1);
   Arena arena;
   protobuf_unittest::TestAllTypes* message2 =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena, message1);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena, message1);
   TestUtil::ExpectAllFieldsSet(*message2);
 }
 
@@ -53,7 +53,7 @@ TEST(CopyMessageTest, ArenaEnabledCopyConstructorArenaLeakTest) {
 
   Arena arena;
   protobuf_unittest::TestAllTypes* message2 =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena, message1);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena, message1);
 
   EXPECT_EQ(message2->optional_string(), message1.optional_string());
   EXPECT_EQ(message2->repeated_string(0), message1.repeated_string(0));

src/google/protobuf/compiler/cpp/move_unittest.cc

@@ -66,12 +66,12 @@ TEST(MovableMessageTest, MoveSameArena) {
   Arena arena;
 
   auto* message1_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena);
   TestUtil::SetAllFields(message1_on_arena);
   const auto* nested = &message1_on_arena->optional_nested_message();
 
   auto* message2_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena);
 
   // Moving messages on the same arena should lead to swapped pointers.
   *message2_on_arena = std::move(*message1_on_arena);
@@ -82,12 +82,12 @@ TEST(MovableMessageTest, MoveDifferentArenas) {
   Arena arena1, arena2;
 
   auto* message1_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena1);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena1);
   TestUtil::SetAllFields(message1_on_arena);
   const auto* nested = &message1_on_arena->optional_nested_message();
 
   auto* message2_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena2);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena2);
 
   // Moving messages on two different arenas should lead to a copy.
   *message2_on_arena = std::move(*message1_on_arena);
@@ -100,7 +100,7 @@ TEST(MovableMessageTest, MoveFromArena) {
   Arena arena;
 
   auto* message1_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena);
   TestUtil::SetAllFields(message1_on_arena);
   const auto* nested = &message1_on_arena->optional_nested_message();
 
@@ -121,7 +121,7 @@ TEST(MovableMessageTest, MoveToArena) {
   const auto* nested = &message1.optional_nested_message();
 
   auto* message2_on_arena =
-      Arena::CreateMessage<protobuf_unittest::TestAllTypes>(&arena);
+      Arena::Create<protobuf_unittest::TestAllTypes>(&arena);
 
   // Moving to a message on the arena should lead to a copy.
   *message2_on_arena = std::move(message1);

src/google/protobuf/compiler/cpp/unittest.inc

@@ -555,7 +555,7 @@ TEST(GENERATED_MESSAGE_TEST_NAME, CopyConstructor) {
 TEST(GENERATED_MESSAGE_TEST_NAME, CopyConstructorWithArenas) {
   Arena arena;
   UNITTEST::TestAllTypes* message1 =
-      Arena::CreateMessage<UNITTEST::TestAllTypes>(&arena);
+      Arena::Create<UNITTEST::TestAllTypes>(&arena);
   TestUtil::SetAllFields(message1);
 
   UNITTEST::TestAllTypes message2_stack(*message1);
@@ -848,7 +848,7 @@ TEST(GENERATED_MESSAGE_TEST_NAME, TestEmbedOptimizedForSize) {
 TEST(GENERATED_MESSAGE_TEST_NAME, TestSpaceUsed) {
   // Allocate explicitly on the heap to prevent arena creation.
   std::unique_ptr<UNITTEST::TestAllTypes> message1(
-    Arena::CreateMessage<UNITTEST::TestAllTypes>(nullptr));
+      Arena::Create<UNITTEST::TestAllTypes>(nullptr));
   // sizeof provides a lower bound on SpaceUsedLong().
   EXPECT_LE(sizeof(UNITTEST::TestAllTypes), message1->SpaceUsedLong());
   const size_t empty_message_size = message1->SpaceUsedLong();
@@ -889,7 +889,7 @@ TEST(GENERATED_MESSAGE_TEST_NAME, TestSpaceUsed) {
 TEST(GENERATED_MESSAGE_TEST_NAME, TestOneofSpaceUsed) {
   // Allocate explicitly on the heap to prevent arena creation.
   std::unique_ptr<UNITTEST::TestOneof2> message1(
-    Arena::CreateMessage<UNITTEST::TestOneof2>(nullptr));
+      Arena::Create<UNITTEST::TestOneof2>(nullptr));
   EXPECT_LE(sizeof(UNITTEST::TestOneof2), message1->SpaceUsedLong());
 
   const size_t empty_message_size = message1->SpaceUsedLong();
@@ -1595,8 +1595,7 @@ TEST_F(OneofTest, SetAllocatedString) {
 TEST_F(OneofTest, ArenaSetAllocatedString) {
   // Check that set_allocated_foo() works for strings.
   Arena arena;
-  UNITTEST::TestOneof2* message =
-      Arena::CreateMessage<UNITTEST::TestOneof2>(&arena);
+  UNITTEST::TestOneof2* message = Arena::Create<UNITTEST::TestOneof2>(&arena);
 
   EXPECT_FALSE(message->has_foo_string());
   const std::string kHello("hello");