Revert changes to "identity" "deflate" "gzip" "stream-gzip" compression algorithm names at surface API

This reverts commit 63602748415fb836afd7a9685fbe5e85bf5ebfed.
This reverts commit 33d7a7aa5a7ff5230a654390779e5da56a7639f8.

6 files changed, 14 insertions, 8 deletions

diff --git a/test/core/channel/channel_args_test.c b/test/core/channel/channel_args_test.c
index ab0e045582..f356c5b0a5 100644
--- a/test/core/channel/channel_args_test.c
+++ b/test/core/channel/channel_args_test.c
@@ -90,7 +90,7 @@ static void test_compression_algorithm_states(void) {
     GPR_ASSERT(GPR_BITGET(states_bitset, i));
   }
 
-  /* disable gzip, deflate and stream-gzip */
+  /* disable message/gzip and message/deflate and stream/gzip */
   ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state(
       &exec_ctx, &ch_args, GRPC_COMPRESS_MESSAGE_GZIP, 0);
   GPR_ASSERT(ch_args == ch_args_wo_gzip);
@@ -113,7 +113,7 @@ static void test_compression_algorithm_states(void) {
     }
   }
 
-  /* re-enabled gzip and stream-gzip only */
+  /* re-enabled message/gzip and stream/gzip only */
   ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state(
       &exec_ctx, &ch_args_wo_gzip_deflate_gzip, GRPC_COMPRESS_MESSAGE_GZIP, 1);
   ch_args_wo_gzip = grpc_channel_args_compression_algorithm_set_state(
diff --git a/test/core/compression/algorithm_test.c b/test/core/compression/algorithm_test.c
index e7a9b0f94a..d637e2c0c2 100644
--- a/test/core/compression/algorithm_test.c
+++ b/test/core/compression/algorithm_test.c
@@ -29,6 +29,7 @@
 #include "src/core/lib/transport/static_metadata.h"
 #include "test/core/util/test_config.h"
 
+const uint32_t message_prefix_length = 8;
 const uint32_t stream_prefix_length = 7;
 static void test_algorithm_mesh(void) {
   int i;
@@ -55,7 +56,7 @@ static void test_algorithm_mesh(void) {
       mdelem = grpc_message_compression_encoding_mdelem(
           grpc_compression_algorithm_to_message_compression_algorithm(parsed));
       grpc_slice value = GRPC_MDVALUE(mdelem);
-      GPR_ASSERT(0 == memcmp(name,
+      GPR_ASSERT(0 == memcmp(&name[message_prefix_length],
                              GRPC_SLICE_START_PTR(value),
                              GRPC_SLICE_LENGTH(value)));
       GPR_ASSERT(grpc_slice_eq(GRPC_MDKEY(mdelem), GRPC_MDSTR_GRPC_ENCODING));
diff --git a/test/core/compression/compression_test.c b/test/core/compression/compression_test.c
index 45a1cf4f75..fb5876a57a 100644
--- a/test/core/compression/compression_test.c
+++ b/test/core/compression/compression_test.c
@@ -28,7 +28,8 @@
 
 static void test_compression_algorithm_parse(void) {
   size_t i;
-  const char *valid_names[] = {"identity", "gzip", "deflate", "stream-gzip"};
+  const char *valid_names[] = {"identity", "message/gzip", "message/deflate",
+                               "stream/gzip"};
   const grpc_compression_algorithm valid_algorithms[] = {
       GRPC_COMPRESS_NONE, GRPC_COMPRESS_MESSAGE_GZIP,
       GRPC_COMPRESS_MESSAGE_DEFLATE, GRPC_COMPRESS_STREAM_GZIP};
@@ -60,7 +61,8 @@ static void test_compression_algorithm_name(void) {
   int success;
   const char *name;
   size_t i;
-  const char *valid_names[] = {"identity", "gzip", "deflate", "stream-gzip"};
+  const char *valid_names[] = {"identity", "message/gzip", "message/deflate",
+                               "stream/gzip"};
   const grpc_compression_algorithm valid_algorithms[] = {
       GRPC_COMPRESS_NONE, GRPC_COMPRESS_MESSAGE_GZIP,
       GRPC_COMPRESS_MESSAGE_DEFLATE, GRPC_COMPRESS_STREAM_GZIP};
diff --git a/test/core/end2end/fuzzers/hpack.dictionary b/test/core/end2end/fuzzers/hpack.dictionary
index c834f1dfef..a87e49ee52 100644
--- a/test/core/end2end/fuzzers/hpack.dictionary
+++ b/test/core/end2end/fuzzers/hpack.dictionary
@@ -28,7 +28,9 @@
 "\x1Egrpc.max_request_message_bytes"
 "\x1Fgrpc.max_response_message_bytes"
 "$/grpc.lb.v1.LoadBalancer/BalanceLoad"
-"\x0Bstream-gzip"
+"\x0Fmessage/deflate"
+"\x0Cmessage/gzip"
+"\x0Bstream/gzip"
 "\x010"
 "\x011"
 "\x012"
diff --git a/test/core/end2end/tests/compressed_payload.c b/test/core/end2end/tests/compressed_payload.c
index 4263eb1363..5c5aa820f7 100644
--- a/test/core/end2end/tests/compressed_payload.c
+++ b/test/core/end2end/tests/compressed_payload.c
@@ -597,7 +597,8 @@ static void test_invoke_request_with_compressed_payload_md_override(
   grpc_metadata identity_compression_override;
 
   gzip_compression_override.key = GRPC_MDSTR_GRPC_INTERNAL_ENCODING_REQUEST;
-  gzip_compression_override.value = grpc_slice_from_static_string("gzip");
+  gzip_compression_override.value =
+      grpc_slice_from_static_string("message/gzip");
   memset(&gzip_compression_override.internal_data, 0,
          sizeof(gzip_compression_override.internal_data));
 
diff --git a/test/core/end2end/tests/stream_compression_compressed_payload.c b/test/core/end2end/tests/stream_compression_compressed_payload.c
index eb31a80302..4c6a9cb852 100644
--- a/test/core/end2end/tests/stream_compression_compressed_payload.c
+++ b/test/core/end2end/tests/stream_compression_compressed_payload.c
@@ -583,7 +583,7 @@ static void test_invoke_request_with_compressed_payload_md_override(
   gzip_compression_override.key =
       GRPC_MDSTR_GRPC_INTERNAL_STREAM_ENCODING_REQUEST;
   gzip_compression_override.value =
-      grpc_slice_from_static_string("stream-gzip");
+      grpc_slice_from_static_string("stream/gzip");
   memset(&gzip_compression_override.internal_data, 0,
          sizeof(gzip_compression_override.internal_data));