Internal change

PiperOrigin-RevId: 485200609

python/google/protobuf/internal/descriptor_test.py

@@ -35,7 +35,6 @@ __author__ = 'robinson@google.com (Will Robinson)'
 import unittest
 import warnings
 
-from google.protobuf import unittest_custom_options_pb2
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
@@ -45,6 +44,7 @@ from google.protobuf import descriptor
 from google.protobuf import descriptor_pool
 from google.protobuf import symbol_database
 from google.protobuf import text_format
+from google.protobuf import unittest_custom_options_pb2
 
 
 TEST_EMPTY_MESSAGE_DESCRIPTOR_ASCII = """

python/google/protobuf/internal/generator_test.py

@@ -42,7 +42,6 @@ __author__ = 'robinson@google.com (Will Robinson)'
 import unittest
 
 from google.protobuf.internal import test_bad_identifiers_pb2
-from google.protobuf import unittest_custom_options_pb2
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_import_public_pb2
 from google.protobuf import unittest_mset_pb2
@@ -51,6 +50,7 @@ from google.protobuf import unittest_no_generic_services_pb2
 from google.protobuf import unittest_pb2
 from google.protobuf import service
 from google.protobuf import symbol_database
+from google.protobuf import unittest_custom_options_pb2
 
 MAX_EXTENSION = 536870912
 

python/google/protobuf/internal/text_format_test.py

@@ -41,7 +41,6 @@ import unittest
 
 from google.protobuf import any_pb2
 from google.protobuf import struct_pb2
-from google.protobuf import unittest_custom_options_pb2
 from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_pb2
 from google.protobuf import unittest_proto3_arena_pb2
@@ -56,6 +55,7 @@ from google.protobuf import text_format
 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
 # pylint: enable=g-import-not-at-top
 
 

src/google/protobuf/compiler/command_line_interface_unittest.cc

@@ -53,7 +53,6 @@
 #include "google/protobuf/any.pb.h"
 #include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
@@ -64,12 +63,13 @@
 #include "absl/strings/substitute.h"
 #include "google/protobuf/compiler/code_generator.h"
 #include "google/protobuf/compiler/command_line_interface.h"
+#include "google/protobuf/compiler/cpp/names.h"
 #include "google/protobuf/compiler/mock_code_generator.h"
 #include "google/protobuf/compiler/subprocess.h"
-#include "google/protobuf/compiler/cpp/names.h"
 #include "google/protobuf/io/io_win32.h"
 #include "google/protobuf/io/printer.h"
 #include "google/protobuf/io/zero_copy_stream.h"
+#include "google/protobuf/unittest_custom_options.pb.h"
 
 // Must be included last.
 #include "google/protobuf/port_def.inc"

src/google/protobuf/compiler/parser_unittest.cc

@@ -42,7 +42,6 @@
 #include "google/protobuf/test_util2.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/any.pb.h"
-#include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/io/zero_copy_stream_impl.h"
 #include "google/protobuf/descriptor.pb.h"
@@ -52,6 +51,7 @@
 #include <gtest/gtest.h>
 #include "absl/strings/str_join.h"
 #include "absl/strings/substitute.h"
+#include "google/protobuf/unittest_custom_options.pb.h"
 
 namespace google {
 namespace protobuf {

src/google/protobuf/descriptor_unittest.cc

@@ -42,9 +42,9 @@
 #include "google/protobuf/compiler/importer.h"
 #include "google/protobuf/compiler/parser.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include "absl/strings/str_format.h"
+#include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/stubs/common.h"
 #include "google/protobuf/stubs/logging.h"
 #include "google/protobuf/unittest_lazy_dependencies.pb.h"

src/google/protobuf/util/type_resolver_util_test.cc

@@ -40,12 +40,12 @@
 #include "google/protobuf/wrappers.pb.h"
 #include "google/protobuf/test_util.h"
 #include "google/protobuf/unittest.pb.h"
-#include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/util/type_resolver.h"
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
 #include "google/protobuf/util/json_format_proto3.pb.h"
 #include "google/protobuf/map_unittest.pb.h"
+#include "google/protobuf/unittest_custom_options.pb.h"
 
 namespace google {
 namespace protobuf {