From 112392a050489f59f91aa6db78e14408db75d98e Mon Sep 17 00:00:00 2001
From: Eric Salo <salo@google.com>
Date: Wed, 10 Jan 2024 18:53:45 -0800
Subject: [PATCH] Fix deprecation warnings from upb

Replace "upb:collections" with "upb:message"
Replace "upb/collections" with "upb/message"
Replace "upb:upb" with "upb:mem" and/or "upb:base"
Replace "upb/upb.hpp" with "upb/mem/arena.hpp" and/or "upb/base/status.hpp"
---
 test/core/gprpp/status_helper_test.cc | 2 +-
 test/cpp/common/alts_util_test.cc     | 2 +-
 test/cpp/grpclb/grpclb_api_test.cc    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/core/gprpp/status_helper_test.cc b/test/core/gprpp/status_helper_test.cc
index 60c257f4a17..fd967742a2d 100644
--- a/test/core/gprpp/status_helper_test.cc
+++ b/test/core/gprpp/status_helper_test.cc
@@ -25,7 +25,7 @@
 #include "gmock/gmock.h"
 #include "google/rpc/status.upb.h"
 #include "gtest/gtest.h"
-#include "upb/upb.hpp"
+#include "upb/mem/arena.hpp"
 
 namespace grpc_core {
 namespace {
diff --git a/test/cpp/common/alts_util_test.cc b/test/cpp/common/alts_util_test.cc
index 597d44e2f9f..74a3fe7fe98 100644
--- a/test/cpp/common/alts_util_test.cc
+++ b/test/cpp/common/alts_util_test.cc
@@ -18,7 +18,7 @@
 
 #include <gtest/gtest.h>
 
-#include "upb/upb.hpp"
+#include "upb/mem/arena.hpp"
 
 #include <grpcpp/security/alts_context.h>
 #include <grpcpp/security/alts_util.h>
diff --git a/test/cpp/grpclb/grpclb_api_test.cc b/test/cpp/grpclb/grpclb_api_test.cc
index 5309eca9756..aba646ec55b 100644
--- a/test/cpp/grpclb/grpclb_api_test.cc
+++ b/test/cpp/grpclb/grpclb_api_test.cc
@@ -19,7 +19,7 @@
 #include <gtest/gtest.h>
 
 #include "google/protobuf/duration.upb.h"
-#include "upb/upb.hpp"
+#include "upb/mem/arena.hpp"
 
 #include <grpc/grpc.h>
 #include <grpcpp/support/config.h>