Internal change

PiperOrigin-RevId: 928008432

Author: protobuf-github-bot

editions/BUILD

@@ -200,9 +200,9 @@ cc_test(
         "//src/google/protobuf:protobuf_lite",
         "//src/google/protobuf:test_textproto",
         "//src/google/protobuf:unittest_features_cc_proto",
-        "//src/google/protobuf/stubs",
         "//src/google/protobuf/testing",
         "//src/google/protobuf/testing:file",
+        "//third_party/gloop/util/status:status_macros",
         "@abseil-cpp//absl/memory",
         "@abseil-cpp//absl/status",
         "@abseil-cpp//absl/status:statusor",

editions/defaults_test.cc

@@ -12,6 +12,7 @@
 #include "absl/strings/escaping.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
+#include "third_party/gloop/util/status/status_macros.h"
 #include "google/protobuf/java_features.pb.h"
 #include "google/protobuf/cpp_features.pb.h"
 #include "editions/defaults_test_embedded.h"
@@ -22,7 +23,6 @@
 #include "google/protobuf/message.h"
 #include "google/protobuf/test_textproto.h"
 #include "google/protobuf/unittest_features.pb.h"
-#include "google/protobuf/stubs/status_macros.h"
 
 
 // Must be included last.