Revert "Refactor Channelz Service to Support Internal Build"

1 files changed, 0 insertions, 16 deletions

diff --git a/include/grpcpp/impl/codegen/config_protobuf.h b/include/grpcpp/impl/codegen/config_protobuf.h
index 598848ee9f..94e593d1ef 100644
--- a/include/grpcpp/impl/codegen/config_protobuf.h
+++ b/include/grpcpp/impl/codegen/config_protobuf.h
@@ -66,11 +66,6 @@
 #define GRPC_CUSTOM_CODEDINPUTSTREAM ::google::protobuf::io::CodedInputStream
 #endif
 
-#ifndef GRPC_CUSTOM_UTIL_STATUS
-#include <google/protobuf/util/json_util.h>
-#define GRPC_CUSTOM_UTIL_STATUS ::google::protobuf::util::Status
-#endif
-
 namespace grpc {
 namespace protobuf {
 
@@ -88,17 +83,6 @@ typedef GRPC_CUSTOM_SERVICEDESCRIPTOR ServiceDescriptor;
 typedef GRPC_CUSTOM_SIMPLEDESCRIPTORDATABASE SimpleDescriptorDatabase;
 typedef GRPC_CUSTOM_SOURCELOCATION SourceLocation;
 
-namespace util {
-typedef GRPC_CUSTOM_UTIL_STATUS Status;
-
-inline util::Status JsonStringToMessage(const std::string& input,
-                                        Message* message) {
-  return ::google::protobuf::util::JsonStringToMessage(
-      input, message, ::google::protobuf::util::JsonParseOptions());
-}
-
-}  // namespace util
-
 namespace io {
 typedef GRPC_CUSTOM_ZEROCOPYOUTPUTSTREAM ZeroCopyOutputStream;
 typedef GRPC_CUSTOM_ZEROCOPYINPUTSTREAM ZeroCopyInputStream;