Internal changes

PiperOrigin-RevId: 485912044

python/google/protobuf/internal/message_test.py

@@ -51,7 +51,6 @@ import warnings
 cmp = lambda x, y: (x > y) - (x < y)
 
 from google.protobuf import unittest_pb2  # pylint: disable=g-import-not-at-top
-from google.protobuf import unittest_proto3_arena_pb2
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import encoder
 from google.protobuf.internal import more_extensions_pb2
@@ -64,6 +63,7 @@ from google.protobuf import message
 from google.protobuf.internal import _parameterized
 from google.protobuf import map_proto2_unittest_pb2
 from google.protobuf import map_unittest_pb2
+from google.protobuf import unittest_proto3_arena_pb2
 
 UCS2_MAXUNICODE = 65535
 

python/google/protobuf/internal/reflection_test.py

@@ -44,7 +44,6 @@ import unittest
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_pb2
-from google.protobuf import unittest_proto3_arena_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf import descriptor
 from google.protobuf import message
@@ -59,6 +58,7 @@ from google.protobuf.internal import test_util
 from google.protobuf.internal import testing_refleaks
 from google.protobuf.internal import decoder
 from google.protobuf.internal import _parameterized
+from google.protobuf import unittest_proto3_arena_pb2
 
 
 warnings.simplefilter('error', DeprecationWarning)

python/google/protobuf/internal/text_format_test.py

@@ -43,7 +43,6 @@ from google.protobuf import any_pb2
 from google.protobuf import struct_pb2
 from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_pb2
-from google.protobuf import unittest_proto3_arena_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import any_test_pb2 as test_extend_any
 from google.protobuf.internal import api_implementation
@@ -56,6 +55,7 @@ from google.protobuf.internal import _parameterized
 from google.protobuf import any_test_pb2
 from google.protobuf import map_unittest_pb2
 from google.protobuf import unittest_custom_options_pb2
+from google.protobuf import unittest_proto3_arena_pb2
 # pylint: enable=g-import-not-at-top
 
 

python/google/protobuf/internal/unknown_fields_test.py

@@ -38,7 +38,6 @@ import unittest
 
 from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_pb2
-from google.protobuf import unittest_proto3_arena_pb2
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import encoder
 from google.protobuf.internal import message_set_extensions_pb2
@@ -50,6 +49,7 @@ from google.protobuf.internal import wire_format
 from google.protobuf import descriptor
 from google.protobuf import unknown_fields
 from google.protobuf import map_unittest_pb2
+from google.protobuf import unittest_proto3_arena_pb2
 try:
   import tracemalloc  # pylint: disable=g-import-not-at-top
 except ImportError:

src/google/protobuf/descriptor_unittest.cc

@@ -48,7 +48,6 @@
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/unittest_lazy_dependencies.pb.h"
-#include "google/protobuf/unittest_proto3_arena.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/descriptor.h"
 #include "google/protobuf/descriptor_database.h"
@@ -58,6 +57,7 @@
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/stubs/logging.h"
+#include "google/protobuf/unittest_proto3_arena.pb.h"
 #include "absl/strings/substitute.h"
 
 

src/google/protobuf/proto3_arena_lite_unittest.cc

@@ -32,9 +32,9 @@
 #include <string>
 #include <vector>
 
-#include "google/protobuf/unittest_proto3_arena.pb.h"
 #include "google/protobuf/arena.h"
 #include <gtest/gtest.h>
+#include "google/protobuf/unittest_proto3_arena.pb.h"
 
 using proto3_arena_unittest::TestAllTypes;
 

src/google/protobuf/proto3_arena_unittest.cc

@@ -33,13 +33,13 @@
 #include <vector>
 
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_proto3_arena.pb.h"
-#include "google/protobuf/unittest_proto3_optional.pb.h"
 #include "google/protobuf/arena.h"
 #include "google/protobuf/text_format.h"
 #include <gtest/gtest.h>
 #include "absl/strings/match.h"
 #include "google/protobuf/test_util.h"
+#include "google/protobuf/unittest_proto3_arena.pb.h"
+#include "google/protobuf/unittest_proto3_optional.pb.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/text_format_unittest.cc

@@ -50,7 +50,6 @@
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_mset.pb.h"
 #include "google/protobuf/unittest_mset_wire_format.pb.h"
-#include "google/protobuf/unittest_proto3.pb.h"
 #include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include <gmock/gmock.h>
@@ -65,6 +64,7 @@
 #include "google/protobuf/map_unittest.pb.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/test_util2.h"
+#include "google/protobuf/unittest_proto3.pb.h"
 
 
 // Must be included last.