Merge deadline_init/deadline_start

8 years ago · 71d6ce65d4
parent 3bd7a2111e
commit 71d6ce65d4
26 changed files with 90 additions and 166 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -908,7 +908,6 @@ endif (gRPC_BUILD_TESTS)

 add_library(grpc
  src/core/lib/surface/init.c
-  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/channel/channel_args.c
  src/core/lib/channel/channel_stack.c
  src/core/lib/channel/channel_stack_builder.c
@ -1051,8 +1050,8 @@ add_library(grpc
  src/core/ext/transport/chttp2/transport/writing.c
  src/core/ext/transport/chttp2/alpn/alpn.c
  src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/http_filters_plugin.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/server/http_server_filter.c
  src/core/lib/http/httpcli_security_connector.c
  src/core/lib/security/context/security_context.c
@ -1103,6 +1102,7 @@ add_library(grpc
  src/core/ext/filters/client_channel/subchannel.c
  src/core/ext/filters/client_channel/subchannel_index.c
  src/core/ext/filters/client_channel/uri_parser.c
+  src/core/ext/filters/deadline/deadline_filter.c
  src/core/ext/transport/chttp2/client/chttp2_connector.c
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
  src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c
@ -1231,7 +1231,6 @@ endif()

 add_library(grpc_cronet
  src/core/lib/surface/init.c
-  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/channel/channel_args.c
  src/core/lib/channel/channel_stack.c
  src/core/lib/channel/channel_stack_builder.c
@ -1377,8 +1376,8 @@ add_library(grpc_cronet
  src/core/ext/transport/chttp2/transport/writing.c
  src/core/ext/transport/chttp2/alpn/alpn.c
  src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/http_filters_plugin.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/server/http_server_filter.c
  src/core/ext/filters/client_channel/channel_connectivity.c
  src/core/ext/filters/client_channel/client_channel.c
@ -1400,6 +1399,7 @@ add_library(grpc_cronet
  src/core/ext/filters/client_channel/subchannel.c
  src/core/ext/filters/client_channel/subchannel_index.c
  src/core/ext/filters/client_channel/uri_parser.c
+  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/http/httpcli_security_connector.c
  src/core/lib/security/context/security_context.c
  src/core/lib/security/credentials/composite/composite_credentials.c
@ -1539,7 +1539,6 @@ add_library(grpc_test_util
  test/core/util/port_server_client.c
  test/core/util/slice_splitter.c
  test/core/util/trickle_endpoint.c
-  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/channel/channel_args.c
  src/core/lib/channel/channel_stack.c
  src/core/lib/channel/channel_stack_builder.c
@ -1795,7 +1794,6 @@ endif (gRPC_BUILD_TESTS)
 add_library(grpc_unsecure
  src/core/lib/surface/init.c
  src/core/lib/surface/init_unsecure.c
-  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/channel/channel_args.c
  src/core/lib/channel/channel_stack.c
  src/core/lib/channel/channel_stack_builder.c
@ -1939,8 +1937,8 @@ add_library(grpc_unsecure
  src/core/ext/transport/chttp2/transport/writing.c
  src/core/ext/transport/chttp2/alpn/alpn.c
  src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/http_filters_plugin.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/server/http_server_filter.c
  src/core/ext/transport/chttp2/server/chttp2_server.c
  src/core/ext/transport/chttp2/client/insecure/channel_create.c
@ -1966,6 +1964,7 @@ add_library(grpc_unsecure
  src/core/ext/filters/client_channel/subchannel.c
  src/core/ext/filters/client_channel/subchannel_index.c
  src/core/ext/filters/client_channel/uri_parser.c
+  src/core/ext/filters/deadline/deadline_filter.c
  src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.c
  src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c
  src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c
@ -2212,7 +2211,6 @@ add_library(grpc++
  src/cpp/util/status.cc
  src/cpp/util/string_ref.cc
  src/cpp/util/time_cc.cc
-  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/channel/channel_args.c
  src/core/lib/channel/channel_stack.c
  src/core/lib/channel/channel_stack_builder.c
@ -2538,7 +2536,6 @@ add_library(grpc++_cronet
  src/cpp/util/status.cc
  src/cpp/util/string_ref.cc
  src/cpp/util/time_cc.cc
-  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/channel/channel_args.c
  src/core/lib/channel/channel_stack.c
  src/core/lib/channel/channel_stack_builder.c
@ -2687,8 +2684,8 @@ add_library(grpc++_cronet
  src/core/ext/transport/chttp2/transport/writing.c
  src/core/ext/transport/chttp2/alpn/alpn.c
  src/core/ext/filters/http/client/http_client_filter.c
-  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/http_filters_plugin.c
+  src/core/ext/filters/http/message_compress/message_compress_filter.c
  src/core/ext/filters/http/server/http_server_filter.c
  src/core/ext/filters/client_channel/channel_connectivity.c
  src/core/ext/filters/client_channel/client_channel.c
@ -2710,6 +2707,7 @@ add_library(grpc++_cronet
  src/core/ext/filters/client_channel/subchannel.c
  src/core/ext/filters/client_channel/subchannel_index.c
  src/core/ext/filters/client_channel/uri_parser.c
+  src/core/ext/filters/deadline/deadline_filter.c
  src/core/ext/transport/chttp2/server/insecure/server_chttp2.c
  src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c
  src/core/ext/transport/chttp2/server/chttp2_server.c
@ -3236,7 +3234,6 @@ add_library(grpc++_unsecure
  src/cpp/util/status.cc
  src/cpp/util/string_ref.cc
  src/cpp/util/time_cc.cc
-  src/core/ext/filters/deadline/deadline_filter.c
  src/core/lib/channel/channel_args.c
  src/core/lib/channel/channel_stack.c
  src/core/lib/channel/channel_stack_builder.c
--- a/19
+++ b/19
@ -2813,7 +2813,6 @@ endif

 LIBGRPC_SRC = \
    src/core/lib/surface/init.c \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
@ -2956,8 +2955,8 @@ LIBGRPC_SRC = \
    src/core/ext/transport/chttp2/transport/writing.c \
    src/core/ext/transport/chttp2/alpn/alpn.c \
    src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/http_filters_plugin.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/server/http_server_filter.c \
    src/core/lib/http/httpcli_security_connector.c \
    src/core/lib/security/context/security_context.c \
@ -3008,6 +3007,7 @@ LIBGRPC_SRC = \
    src/core/ext/filters/client_channel/subchannel.c \
    src/core/ext/filters/client_channel/subchannel_index.c \
    src/core/ext/filters/client_channel/uri_parser.c \
+    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/ext/transport/chttp2/client/chttp2_connector.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \
@ -3134,7 +3134,6 @@ endif

 LIBGRPC_CRONET_SRC = \
    src/core/lib/surface/init.c \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
@ -3280,8 +3279,8 @@ LIBGRPC_CRONET_SRC = \
    src/core/ext/transport/chttp2/transport/writing.c \
    src/core/ext/transport/chttp2/alpn/alpn.c \
    src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/http_filters_plugin.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/server/http_server_filter.c \
    src/core/ext/filters/client_channel/channel_connectivity.c \
    src/core/ext/filters/client_channel/client_channel.c \
@ -3303,6 +3302,7 @@ LIBGRPC_CRONET_SRC = \
    src/core/ext/filters/client_channel/subchannel.c \
    src/core/ext/filters/client_channel/subchannel_index.c \
    src/core/ext/filters/client_channel/uri_parser.c \
+    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/http/httpcli_security_connector.c \
    src/core/lib/security/context/security_context.c \
    src/core/lib/security/credentials/composite/composite_credentials.c \
@ -3441,7 +3441,6 @@ LIBGRPC_TEST_UTIL_SRC = \
    test/core/util/port_server_client.c \
    test/core/util/slice_splitter.c \
    test/core/util/trickle_endpoint.c \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
@ -3669,7 +3668,6 @@ endif
 LIBGRPC_UNSECURE_SRC = \
    src/core/lib/surface/init.c \
    src/core/lib/surface/init_unsecure.c \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
@ -3813,8 +3811,8 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/transport/chttp2/transport/writing.c \
    src/core/ext/transport/chttp2/alpn/alpn.c \
    src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/http_filters_plugin.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/server/http_server_filter.c \
    src/core/ext/transport/chttp2/server/chttp2_server.c \
    src/core/ext/transport/chttp2/client/insecure/channel_create.c \
@ -3840,6 +3838,7 @@ LIBGRPC_UNSECURE_SRC = \
    src/core/ext/filters/client_channel/subchannel.c \
    src/core/ext/filters/client_channel/subchannel_index.c \
    src/core/ext/filters/client_channel/uri_parser.c \
+    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/ext/filters/client_channel/resolver/dns/c_ares/dns_resolver_ares.c \
    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.c \
    src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.c \
@ -4063,7 +4062,6 @@ LIBGRPC++_SRC = \
    src/cpp/util/status.cc \
    src/cpp/util/string_ref.cc \
    src/cpp/util/time_cc.cc \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
@ -4397,7 +4395,6 @@ LIBGRPC++_CRONET_SRC = \
    src/cpp/util/status.cc \
    src/cpp/util/string_ref.cc \
    src/cpp/util/time_cc.cc \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
@ -4546,8 +4543,8 @@ LIBGRPC++_CRONET_SRC = \
    src/core/ext/transport/chttp2/transport/writing.c \
    src/core/ext/transport/chttp2/alpn/alpn.c \
    src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/http_filters_plugin.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/server/http_server_filter.c \
    src/core/ext/filters/client_channel/channel_connectivity.c \
    src/core/ext/filters/client_channel/client_channel.c \
@ -4569,6 +4566,7 @@ LIBGRPC++_CRONET_SRC = \
    src/core/ext/filters/client_channel/subchannel.c \
    src/core/ext/filters/client_channel/subchannel_index.c \
    src/core/ext/filters/client_channel/uri_parser.c \
+    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \
    src/core/ext/transport/chttp2/server/chttp2_server.c \
@ -5087,7 +5085,6 @@ LIBGRPC++_UNSECURE_SRC = \
    src/cpp/util/status.cc \
    src/cpp/util/string_ref.cc \
    src/cpp/util/time_cc.cc \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
--- a/binding.gyp
+++ b/binding.gyp
@ -649,7 +649,6 @@
      ],
      'sources': [
        'src/core/lib/surface/init.c',
-        'src/core/ext/filters/deadline/deadline_filter.c',
        'src/core/lib/channel/channel_args.c',
        'src/core/lib/channel/channel_stack.c',
        'src/core/lib/channel/channel_stack_builder.c',
@ -792,8 +791,8 @@
        'src/core/ext/transport/chttp2/transport/writing.c',
        'src/core/ext/transport/chttp2/alpn/alpn.c',
        'src/core/ext/filters/http/client/http_client_filter.c',
-        'src/core/ext/filters/http/message_compress/message_compress_filter.c',
        'src/core/ext/filters/http/http_filters_plugin.c',
+        'src/core/ext/filters/http/message_compress/message_compress_filter.c',
        'src/core/ext/filters/http/server/http_server_filter.c',
        'src/core/lib/http/httpcli_security_connector.c',
        'src/core/lib/security/context/security_context.c',
@ -844,6 +843,7 @@
        'src/core/ext/filters/client_channel/subchannel.c',
        'src/core/ext/filters/client_channel/subchannel_index.c',
        'src/core/ext/filters/client_channel/uri_parser.c',
+        'src/core/ext/filters/deadline/deadline_filter.c',
        'src/core/ext/transport/chttp2/client/chttp2_connector.c',
        'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
        'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c',
--- a/build.yaml
+++ b/build.yaml
@ -173,7 +173,6 @@ filegroups:
  - include/grpc/slice_buffer.h
  - include/grpc/status.h
  headers:
-  - src/core/ext/filters/deadline/deadline_filter.h
  - src/core/lib/channel/channel_args.h
  - src/core/lib/channel/channel_stack.h
  - src/core/lib/channel/channel_stack_builder.h
@ -280,7 +279,6 @@ filegroups:
  - src/core/lib/transport/transport.h
  - src/core/lib/transport/transport_impl.h
  src:
-  - src/core/ext/filters/deadline/deadline_filter.c
  - src/core/lib/channel/channel_args.c
  - src/core/lib/channel/channel_stack.c
  - src/core/lib/channel/channel_stack_builder.c
@ -476,8 +474,8 @@ filegroups:
  - src/core/ext/filters/http/server/http_server_filter.h
  src:
  - src/core/ext/filters/http/client/http_client_filter.c
-  - src/core/ext/filters/http/message_compress/message_compress_filter.c
  - src/core/ext/filters/http/http_filters_plugin.c
+  - src/core/ext/filters/http/message_compress/message_compress_filter.c
  - src/core/ext/filters/http/server/http_server_filter.c
  plugin: grpc_http_filters
  uses:
--- a/config.m4
+++ b/config.m4
@ -83,7 +83,6 @@ if test "$PHP_GRPC" != "no"; then
    src/core/lib/support/tmpfile_windows.c \
    src/core/lib/support/wrap_memcpy.c \
    src/core/lib/surface/init.c \
-    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/lib/channel/channel_args.c \
    src/core/lib/channel/channel_stack.c \
    src/core/lib/channel/channel_stack_builder.c \
@ -226,8 +225,8 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/transport/chttp2/transport/writing.c \
    src/core/ext/transport/chttp2/alpn/alpn.c \
    src/core/ext/filters/http/client/http_client_filter.c \
-    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/http_filters_plugin.c \
+    src/core/ext/filters/http/message_compress/message_compress_filter.c \
    src/core/ext/filters/http/server/http_server_filter.c \
    src/core/lib/http/httpcli_security_connector.c \
    src/core/lib/security/context/security_context.c \
@ -278,6 +277,7 @@ if test "$PHP_GRPC" != "no"; then
    src/core/ext/filters/client_channel/subchannel.c \
    src/core/ext/filters/client_channel/subchannel_index.c \
    src/core/ext/filters/client_channel/uri_parser.c \
+    src/core/ext/filters/deadline/deadline_filter.c \
    src/core/ext/transport/chttp2/client/chttp2_connector.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2.c \
    src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c \
@ -641,7 +641,7 @@ if test "$PHP_GRPC" != "no"; then
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/deadline)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/client)
-  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/compress)
+  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/message_compress)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/http/server)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/load_reporting)
  PHP_ADD_BUILD_DIR($ext_builddir/src/core/ext/filters/max_age)
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@ -255,7 +255,6 @@ Pod::Spec.new do |s|
                      'src/core/lib/support/tmpfile_posix.c',
                      'src/core/lib/support/tmpfile_windows.c',
                      'src/core/lib/support/wrap_memcpy.c',
-                      'src/core/ext/filters/deadline/deadline_filter.h',
                      'src/core/lib/channel/channel_args.h',
                      'src/core/lib/channel/channel_stack.h',
                      'src/core/lib/channel/channel_stack_builder.h',
@ -426,6 +425,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.h',
                      'src/core/ext/filters/client_channel/subchannel_index.h',
                      'src/core/ext/filters/client_channel/uri_parser.h',
+                      'src/core/ext/filters/deadline/deadline_filter.h',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h',
                      'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
@ -458,7 +458,6 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/max_age/max_age_filter.h',
                      'src/core/ext/filters/message_size/message_size_filter.h',
                      'src/core/lib/surface/init.c',
-                      'src/core/ext/filters/deadline/deadline_filter.c',
                      'src/core/lib/channel/channel_args.c',
                      'src/core/lib/channel/channel_stack.c',
                      'src/core/lib/channel/channel_stack_builder.c',
@ -601,8 +600,8 @@ Pod::Spec.new do |s|
                      'src/core/ext/transport/chttp2/transport/writing.c',
                      'src/core/ext/transport/chttp2/alpn/alpn.c',
                      'src/core/ext/filters/http/client/http_client_filter.c',
-                      'src/core/ext/filters/http/message_compress/message_compress_filter.c',
                      'src/core/ext/filters/http/http_filters_plugin.c',
+                      'src/core/ext/filters/http/message_compress/message_compress_filter.c',
                      'src/core/ext/filters/http/server/http_server_filter.c',
                      'src/core/lib/http/httpcli_security_connector.c',
                      'src/core/lib/security/context/security_context.c',
@ -653,6 +652,7 @@ Pod::Spec.new do |s|
                      'src/core/ext/filters/client_channel/subchannel.c',
                      'src/core/ext/filters/client_channel/subchannel_index.c',
                      'src/core/ext/filters/client_channel/uri_parser.c',
+                      'src/core/ext/filters/deadline/deadline_filter.c',
                      'src/core/ext/transport/chttp2/client/chttp2_connector.c',
                      'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
                      'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c',
@ -706,7 +706,6 @@ Pod::Spec.new do |s|
                              'src/core/lib/support/thd_internal.h',
                              'src/core/lib/support/time_precise.h',
                              'src/core/lib/support/tmpfile.h',
-                              'src/core/ext/filters/deadline/deadline_filter.h',
                              'src/core/lib/channel/channel_args.h',
                              'src/core/lib/channel/channel_stack.h',
                              'src/core/lib/channel/channel_stack_builder.h',
@ -877,6 +876,7 @@ Pod::Spec.new do |s|
                              'src/core/ext/filters/client_channel/subchannel.h',
                              'src/core/ext/filters/client_channel/subchannel_index.h',
                              'src/core/ext/filters/client_channel/uri_parser.h',
+                              'src/core/ext/filters/deadline/deadline_filter.h',
                              'src/core/ext/transport/chttp2/client/chttp2_connector.h',
                              'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h',
                              'src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h',
--- a/grpc.gemspec
+++ b/grpc.gemspec
@ -171,7 +171,6 @@ Gem::Specification.new do |s|
  s.files += %w( include/grpc/impl/codegen/sync_windows.h )
  s.files += %w( include/grpc/grpc_security.h )
  s.files += %w( include/grpc/census.h )
-  s.files += %w( src/core/ext/filters/deadline/deadline_filter.h )
  s.files += %w( src/core/lib/channel/channel_args.h )
  s.files += %w( src/core/lib/channel/channel_stack.h )
  s.files += %w( src/core/lib/channel/channel_stack_builder.h )
@ -342,6 +341,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/subchannel.h )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_index.h )
  s.files += %w( src/core/ext/filters/client_channel/uri_parser.h )
+  s.files += %w( src/core/ext/filters/deadline/deadline_filter.h )
  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h )
  s.files += %w( src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h )
@ -374,7 +374,6 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/max_age/max_age_filter.h )
  s.files += %w( src/core/ext/filters/message_size/message_size_filter.h )
  s.files += %w( src/core/lib/surface/init.c )
-  s.files += %w( src/core/ext/filters/deadline/deadline_filter.c )
  s.files += %w( src/core/lib/channel/channel_args.c )
  s.files += %w( src/core/lib/channel/channel_stack.c )
  s.files += %w( src/core/lib/channel/channel_stack_builder.c )
@ -517,8 +516,8 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/transport/chttp2/transport/writing.c )
  s.files += %w( src/core/ext/transport/chttp2/alpn/alpn.c )
  s.files += %w( src/core/ext/filters/http/client/http_client_filter.c )
-  s.files += %w( src/core/ext/filters/http/message_compress/message_compress_filter.c )
  s.files += %w( src/core/ext/filters/http/http_filters_plugin.c )
+  s.files += %w( src/core/ext/filters/http/message_compress/message_compress_filter.c )
  s.files += %w( src/core/ext/filters/http/server/http_server_filter.c )
  s.files += %w( src/core/lib/http/httpcli_security_connector.c )
  s.files += %w( src/core/lib/security/context/security_context.c )
@ -569,6 +568,7 @@ Gem::Specification.new do |s|
  s.files += %w( src/core/ext/filters/client_channel/subchannel.c )
  s.files += %w( src/core/ext/filters/client_channel/subchannel_index.c )
  s.files += %w( src/core/ext/filters/client_channel/uri_parser.c )
+  s.files += %w( src/core/ext/filters/deadline/deadline_filter.c )
  s.files += %w( src/core/ext/transport/chttp2/client/chttp2_connector.c )
  s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2.c )
  s.files += %w( src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c )
--- a/package.xml
+++ b/package.xml
@ -180,7 +180,6 @@
    <file baseinstalldir="/" name="include/grpc/impl/codegen/sync_windows.h" role="src" />
    <file baseinstalldir="/" name="include/grpc/grpc_security.h" role="src" />
    <file baseinstalldir="/" name="include/grpc/census.h" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/channel_args.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/channel_stack.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/channel_stack_builder.h" role="src" />
@ -351,6 +350,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_index.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/uri_parser.h" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel.h" role="src" />
@ -383,7 +383,6 @@
    <file baseinstalldir="/" name="src/core/ext/filters/max_age/max_age_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/message_size/message_size_filter.h" role="src" />
    <file baseinstalldir="/" name="src/core/lib/surface/init.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/channel_args.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/channel_stack.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/channel/channel_stack_builder.c" role="src" />
@ -526,8 +525,8 @@
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/writing.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/alpn/alpn.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/http/client/http_client_filter.c" role="src" />
-    <file baseinstalldir="/" name="src/core/ext/filters/http/message_compress/message_compress_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/http/http_filters_plugin.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/http/message_compress/message_compress_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/http/server/http_server_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/http/httpcli_security_connector.c" role="src" />
    <file baseinstalldir="/" name="src/core/lib/security/context/security_context.c" role="src" />
@ -578,6 +577,7 @@
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/subchannel_index.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/filters/client_channel/uri_parser.c" role="src" />
+    <file baseinstalldir="/" name="src/core/ext/filters/deadline/deadline_filter.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/client/chttp2_connector.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2.c" role="src" />
    <file baseinstalldir="/" name="src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c" role="src" />
--- a/src/core/ext/filters/client_channel/client_channel.c
+++ b/src/core/ext/filters/client_channel/client_channel.c
@ -1278,8 +1278,7 @@ static grpc_error *cc_init_call_elem(grpc_exec_ctx *exec_ctx,
  calld->owning_call = args->call_stack;
  calld->arena = args->arena;
  if (chand->deadline_checking_enabled) {
-    grpc_deadline_state_init(exec_ctx, elem, args->call_stack);
-    grpc_deadline_state_start(exec_ctx, elem, calld->deadline);
+    grpc_deadline_state_init(exec_ctx, elem, args->call_stack, calld->deadline);
  }
  return GRPC_ERROR_NONE;
 }
--- a/src/core/ext/filters/deadline/deadline_filter.c
+++ b/src/core/ext/filters/deadline/deadline_filter.c
@ -143,18 +143,6 @@ static void inject_on_complete_cb(grpc_deadline_state* deadline_state,
  op->on_complete = &deadline_state->on_complete;
 }

-void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem,
-                              grpc_call_stack* call_stack) {
-  grpc_deadline_state* deadline_state = elem->call_data;
-  deadline_state->call_stack = call_stack;
-}
-
-void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx,
-                                 grpc_call_element* elem) {
-  grpc_deadline_state* deadline_state = elem->call_data;
-  cancel_timer_if_needed(exec_ctx, deadline_state);
-}
-
 // Callback and associated state for starting the timer after call stack
 // initialization has been completed.
 struct start_timer_after_init_state {
@ -169,8 +157,11 @@ static void start_timer_after_init(grpc_exec_ctx* exec_ctx, void* arg,
  gpr_free(state);
 }

-void grpc_deadline_state_start(grpc_exec_ctx* exec_ctx, grpc_call_element* elem,
-                               gpr_timespec deadline) {
+void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem,
+                              grpc_call_stack* call_stack,
+                              gpr_timespec deadline) {
+  grpc_deadline_state* deadline_state = elem->call_data;
+  deadline_state->call_stack = call_stack;
  // Deadline will always be infinite on servers, so the timer will only be
  // set on clients with a finite deadline.
  deadline = gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC);
@ -191,6 +182,12 @@ void grpc_deadline_state_start(grpc_exec_ctx* exec_ctx, grpc_call_element* elem,
  }
 }

+void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx,
+                                 grpc_call_element* elem) {
+  grpc_deadline_state* deadline_state = elem->call_data;
+  cancel_timer_if_needed(exec_ctx, deadline_state);
+}
+
 void grpc_deadline_state_reset(grpc_exec_ctx* exec_ctx, grpc_call_element* elem,
                               gpr_timespec new_deadline) {
  grpc_deadline_state* deadline_state = elem->call_data;
@ -250,8 +247,7 @@ typedef struct server_call_data {
 static grpc_error* init_call_elem(grpc_exec_ctx* exec_ctx,
                                  grpc_call_element* elem,
                                  const grpc_call_element_args* args) {
-  grpc_deadline_state_init(exec_ctx, elem, args->call_stack);
-  grpc_deadline_state_start(exec_ctx, elem, args->deadline);
+  grpc_deadline_state_init(exec_ctx, elem, args->call_stack, args->deadline);
  return GRPC_ERROR_NONE;
 }

--- a/src/core/ext/filters/deadline/deadline_filter.h
+++ b/src/core/ext/filters/deadline/deadline_filter.h
@ -64,15 +64,11 @@ typedef struct grpc_deadline_state {

 // assumes elem->call_data is zero'd
 void grpc_deadline_state_init(grpc_exec_ctx* exec_ctx, grpc_call_element* elem,
-                              grpc_call_stack* call_stack);
+                              grpc_call_stack* call_stack,
+                              gpr_timespec deadline);
 void grpc_deadline_state_destroy(grpc_exec_ctx* exec_ctx,
                                 grpc_call_element* elem);

-// Starts the timer with the specified deadline.
-// Should be called from the filter's init_call_elem() method.
-void grpc_deadline_state_start(grpc_exec_ctx* exec_ctx, grpc_call_element* elem,
-                               gpr_timespec deadline);
-
 // Cancels the existing timer and starts a new one with new_deadline.
 //
 // Note: It is generally safe to call this with an earlier deadline
--- a/src/core/ext/filters/http/message_compress/message_compress_filter.h
+++ b/src/core/ext/filters/http/message_compress/message_compress_filter.h
@ -62,6 +62,6 @@ extern int grpc_compression_trace;
 * aforementioned 'grpc-encoding' metadata value, data will pass through
 * uncompressed. */

-extern const grpc_channel_filter grpc_compress_filter;
+extern const grpc_channel_filter grpc_message_compress_filter;

 #endif /* GRPC_CORE_EXT_FILTERS_HTTP_COMPRESS_COMPRESS_FILTER_H */
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@ -77,7 +77,6 @@ CORE_SOURCE_FILES = [
  'src/core/lib/support/tmpfile_windows.c',
  'src/core/lib/support/wrap_memcpy.c',
  'src/core/lib/surface/init.c',
-  'src/core/ext/filters/deadline/deadline_filter.c',
  'src/core/lib/channel/channel_args.c',
  'src/core/lib/channel/channel_stack.c',
  'src/core/lib/channel/channel_stack_builder.c',
@ -220,8 +219,8 @@ CORE_SOURCE_FILES = [
  'src/core/ext/transport/chttp2/transport/writing.c',
  'src/core/ext/transport/chttp2/alpn/alpn.c',
  'src/core/ext/filters/http/client/http_client_filter.c',
-  'src/core/ext/filters/http/message_compress/message_compress_filter.c',
  'src/core/ext/filters/http/http_filters_plugin.c',
+  'src/core/ext/filters/http/message_compress/message_compress_filter.c',
  'src/core/ext/filters/http/server/http_server_filter.c',
  'src/core/lib/http/httpcli_security_connector.c',
  'src/core/lib/security/context/security_context.c',
@ -272,6 +271,7 @@ CORE_SOURCE_FILES = [
  'src/core/ext/filters/client_channel/subchannel.c',
  'src/core/ext/filters/client_channel/subchannel_index.c',
  'src/core/ext/filters/client_channel/uri_parser.c',
+  'src/core/ext/filters/deadline/deadline_filter.c',
  'src/core/ext/transport/chttp2/client/chttp2_connector.c',
  'src/core/ext/transport/chttp2/server/insecure/server_chttp2.c',
  'src/core/ext/transport/chttp2/server/insecure/server_chttp2_posix.c',
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@ -900,8 +900,6 @@ include/grpc/load_reporting.h \
 include/grpc/slice.h \
 include/grpc/slice_buffer.h \
 include/grpc/status.h \
-src/core/ext/filters/deadline/deadline_filter.c \
-src/core/ext/filters/deadline/deadline_filter.h \
 src/core/lib/channel/channel_args.c \
 src/core/lib/channel/channel_args.h \
 src/core/lib/channel/channel_stack.c \
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@ -958,9 +958,9 @@ src/core/ext/filters/deadline/deadline_filter.c \
 src/core/ext/filters/deadline/deadline_filter.h \
 src/core/ext/filters/http/client/http_client_filter.c \
 src/core/ext/filters/http/client/http_client_filter.h \
+src/core/ext/filters/http/http_filters_plugin.c \
 src/core/ext/filters/http/message_compress/message_compress_filter.c \
 src/core/ext/filters/http/message_compress/message_compress_filter.h \
-src/core/ext/filters/http/http_filters_plugin.c \
 src/core/ext/filters/http/server/http_server_filter.c \
 src/core/ext/filters/http/server/http_server_filter.h \
 src/core/ext/filters/load_reporting/load_reporting.c \
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -7535,7 +7535,6 @@
      "include/grpc/slice.h", 
      "include/grpc/slice_buffer.h", 
      "include/grpc/status.h", 
-      "src/core/ext/filters/deadline/deadline_filter.h", 
      "src/core/lib/channel/channel_args.h", 
      "src/core/lib/channel/channel_stack.h", 
      "src/core/lib/channel/channel_stack_builder.h", 
@ -7656,8 +7655,6 @@
      "include/grpc/slice.h", 
      "include/grpc/slice_buffer.h", 
      "include/grpc/status.h", 
-      "src/core/ext/filters/deadline/deadline_filter.c", 
-      "src/core/ext/filters/deadline/deadline_filter.h", 
      "src/core/lib/channel/channel_args.c", 
      "src/core/lib/channel/channel_args.h", 
      "src/core/lib/channel/channel_stack.c", 
@ -8022,9 +8019,9 @@
    "src": [
      "src/core/ext/filters/http/client/http_client_filter.c", 
      "src/core/ext/filters/http/client/http_client_filter.h", 
+      "src/core/ext/filters/http/http_filters_plugin.c", 
      "src/core/ext/filters/http/message_compress/message_compress_filter.c", 
      "src/core/ext/filters/http/message_compress/message_compress_filter.h", 
-      "src/core/ext/filters/http/http_filters_plugin.c", 
      "src/core/ext/filters/http/server/http_server_filter.c", 
      "src/core/ext/filters/http/server/http_server_filter.h"
    ], 
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj
@ -377,7 +377,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\thread_manager\thread_manager.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.h" />
@ -571,8 +570,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time_cc.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.c">
--- a/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++/grpc++.vcxproj.filters
@ -124,9 +124,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time_cc.cc">
      <Filter>src\cpp\util</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
@ -851,9 +848,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\cpp\thread_manager\thread_manager.h">
      <Filter>src\cpp\thread_manager</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
@ -1226,15 +1220,6 @@
    <Filter Include="src\core">
      <UniqueIdentifier>{d02f1155-7e7e-3736-3c69-dc9146dc523d}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\ext">
-      <UniqueIdentifier>{96d09c4a-59f9-3486-6c2f-cbf695b285d8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\ext\filters">
-      <UniqueIdentifier>{ec936f3c-c278-59b3-1fcf-d17ab77c8546}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\ext\filters\deadline">
-      <UniqueIdentifier>{136a9e7f-2e8b-7cff-c961-5149529ca0f5}</UniqueIdentifier>
-    </Filter>
    <Filter Include="src\core\lib">
      <UniqueIdentifier>{80567a8f-622f-a3ce-c12d-aebb63984b07}</UniqueIdentifier>
    </Filter>
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj
@ -371,7 +371,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\health\health.pb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\server\thread_pool_interface.h" />
    <ClInclude Include="$(SolutionDir)\..\src\cpp\thread_manager\thread_manager.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.h" />
@ -555,8 +554,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time_cc.cc">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.c">
--- a/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc++_unsecure/grpc++_unsecure.vcxproj.filters
@ -109,9 +109,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\cpp\util\time_cc.cc">
      <Filter>src\cpp\util</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
@ -818,9 +815,6 @@
    <ClInclude Include="$(SolutionDir)\..\src\cpp\thread_manager\thread_manager.h">
      <Filter>src\cpp\thread_manager</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
@ -1193,15 +1187,6 @@
    <Filter Include="src\core">
      <UniqueIdentifier>{595f2ea0-aafb-87e5-c938-db3ff0b0c69a}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\ext">
-      <UniqueIdentifier>{52eca76b-9502-3d96-9064-6415226a860f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\ext\filters">
-      <UniqueIdentifier>{d2564ab1-6815-d425-3f8a-31693cc2ac81}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\ext\filters\deadline">
-      <UniqueIdentifier>{0cc70f19-99bb-5e9e-99d9-b103398c0e76}</UniqueIdentifier>
-    </Filter>
    <Filter Include="src\core\lib">
      <UniqueIdentifier>{cf8fd5d8-ff54-331d-2d20-36d6cae0e14b}</UniqueIdentifier>
    </Filter>
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj
@ -300,7 +300,6 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.h" />
@ -426,7 +425,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\alpn\alpn.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\context\security_context.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\security\credentials\composite\composite_credentials.h" />
@ -471,6 +470,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\subchannel.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\subchannel_index.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\chttp2_connector.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\lb_policy\grpclb\grpclb.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\lb_policy\grpclb\grpclb_channel.h" />
@ -506,8 +506,6 @@
  <ItemGroup>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.c">
@ -792,10 +790,10 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\http_filters_plugin.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\http\httpcli_security_connector.c">
@ -896,6 +894,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\chttp2_connector.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\insecure\server_chttp2.c">
--- a/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc/grpc.vcxproj.filters
@ -4,9 +4,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init.c">
      <Filter>src\core\lib\surface</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
@ -433,12 +430,12 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.c">
      <Filter>src\core\ext\filters\http\client</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.c">
-      <Filter>src\core\ext\filters\http\compress</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\http_filters_plugin.c">
      <Filter>src\core\ext\filters\http</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.c">
+      <Filter>src\core\ext\filters\http\message_compress</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.c">
      <Filter>src\core\ext\filters\http\server</Filter>
    </ClCompile>
@ -589,6 +586,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.c">
      <Filter>src\core\ext\filters\client_channel</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
+      <Filter>src\core\ext\filters\deadline</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\chttp2_connector.c">
      <Filter>src\core\ext\transport\chttp2\client</Filter>
    </ClCompile>
@ -800,9 +800,6 @@
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
@ -1178,8 +1175,8 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.h">
      <Filter>src\core\ext\filters\http\client</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.h">
-      <Filter>src\core\ext\filters\http\compress</Filter>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.h">
+      <Filter>src\core\ext\filters\http\message_compress</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.h">
      <Filter>src\core\ext\filters\http\server</Filter>
@ -1313,6 +1310,9 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.h">
      <Filter>src\core\ext\filters\client_channel</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h">
+      <Filter>src\core\ext\filters\deadline</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\chttp2_connector.h">
      <Filter>src\core\ext\transport\chttp2\client</Filter>
    </ClInclude>
@ -1490,8 +1490,8 @@
    <Filter Include="src\core\ext\filters\http\client">
      <UniqueIdentifier>{e4f7616b-2b49-7df9-8ca3-eb7848d4609d}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\ext\filters\http\compress">
-      <UniqueIdentifier>{8f3d6045-e672-b61f-437e-052557970f41}</UniqueIdentifier>
+    <Filter Include="src\core\ext\filters\http\message_compress">
+      <UniqueIdentifier>{7b595f5a-c5b5-29fe-74c2-5ec5fd5c94d2}</UniqueIdentifier>
    </Filter>
    <Filter Include="src\core\ext\filters\http\server">
      <UniqueIdentifier>{a40e82ca-0c04-35b8-898d-7ad5f323d110}</UniqueIdentifier>
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
@ -195,7 +195,6 @@
    <ClInclude Include="$(SolutionDir)\..\test\core\util\port_server_client.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\util\slice_splitter.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\util\trickle_endpoint.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.h" />
@ -343,8 +342,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\test\core\util\trickle_endpoint.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.c">
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
@ -61,9 +61,6 @@
    <ClCompile Include="$(SolutionDir)\..\test\core\util\trickle_endpoint.c">
      <Filter>test\core\util</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
@ -563,9 +560,6 @@
    <ClInclude Include="$(SolutionDir)\..\test\core\util\trickle_endpoint.h">
      <Filter>test\core\util</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
@ -902,15 +896,6 @@
    <Filter Include="src\core">
      <UniqueIdentifier>{f7bfac91-5eb2-dea7-4601-6c63edbbf997}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\ext">
-      <UniqueIdentifier>{5db70e06-741d-708c-bf0a-b59f8ca1f8bd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\ext\filters">
-      <UniqueIdentifier>{f0f88514-c2d8-c4c9-c3bd-591682207751}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="src\core\ext\filters\deadline">
-      <UniqueIdentifier>{2c9ab189-bb7e-355d-9f37-385472e86b9f}</UniqueIdentifier>
-    </Filter>
    <Filter Include="src\core\lib">
      <UniqueIdentifier>{f4e8c61e-1ca6-0fdd-7b5e-b7f9a30c9a21}</UniqueIdentifier>
    </Filter>
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj
@ -290,7 +290,6 @@
    <ClInclude Include="$(SolutionDir)\..\include\grpc\census.h" />
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack_builder.h" />
@ -416,7 +415,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\transport\varint.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\alpn\alpn.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.h" />
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\chttp2_server.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\client\chttp2_connector.h" />
@ -438,6 +437,7 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\subchannel.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\subchannel_index.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.h" />
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\resolver\dns\c_ares\grpc_ares_ev_driver.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\resolver\dns\c_ares\grpc_ares_wrapper.h" />
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\load_reporting\load_reporting.h" />
@ -474,8 +474,6 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_unsecure.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_stack.c">
@ -762,10 +760,10 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.c">
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\http_filters_plugin.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\transport\chttp2\server\chttp2_server.c">
@ -816,6 +814,8 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.c">
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\resolver\dns\c_ares\dns_resolver_ares.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\resolver\dns\c_ares\grpc_ares_ev_driver_posix.c">
--- a/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters
@ -7,9 +7,6 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\surface\init_unsecure.c">
      <Filter>src\core\lib\surface</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.c">
      <Filter>src\core\lib\channel</Filter>
    </ClCompile>
@ -439,12 +436,12 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.c">
      <Filter>src\core\ext\filters\http\client</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.c">
-      <Filter>src\core\ext\filters\http\compress</Filter>
-    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\http_filters_plugin.c">
      <Filter>src\core\ext\filters\http</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.c">
+      <Filter>src\core\ext\filters\http\message_compress</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.c">
      <Filter>src\core\ext\filters\http\server</Filter>
    </ClCompile>
@ -520,6 +517,9 @@
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.c">
      <Filter>src\core\ext\filters\client_channel</Filter>
    </ClCompile>
+    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.c">
+      <Filter>src\core\ext\filters\deadline</Filter>
+    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\resolver\dns\c_ares\dns_resolver_ares.c">
      <Filter>src\core\ext\filters\client_channel\resolver\dns\c_ares</Filter>
    </ClCompile>
@ -713,9 +713,6 @@
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h">
-      <Filter>src\core\ext\filters\deadline</Filter>
-    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\lib\channel\channel_args.h">
      <Filter>src\core\lib\channel</Filter>
    </ClInclude>
@ -1091,8 +1088,8 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\client\http_client_filter.h">
      <Filter>src\core\ext\filters\http\client</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\compress\compress_filter.h">
-      <Filter>src\core\ext\filters\http\compress</Filter>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\message_compress\message_compress_filter.h">
+      <Filter>src\core\ext\filters\http\message_compress</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\http\server\http_server_filter.h">
      <Filter>src\core\ext\filters\http\server</Filter>
@ -1157,6 +1154,9 @@
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\uri_parser.h">
      <Filter>src\core\ext\filters\client_channel</Filter>
    </ClInclude>
+    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\deadline\deadline_filter.h">
+      <Filter>src\core\ext\filters\deadline</Filter>
+    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\src\core\ext\filters\client_channel\resolver\dns\c_ares\grpc_ares_ev_driver.h">
      <Filter>src\core\ext\filters\client_channel\resolver\dns\c_ares</Filter>
    </ClInclude>
@ -1331,8 +1331,8 @@
    <Filter Include="src\core\ext\filters\http\client">
      <UniqueIdentifier>{95cd5972-7339-6f09-2332-e6769b3cba3f}</UniqueIdentifier>
    </Filter>
-    <Filter Include="src\core\ext\filters\http\compress">
-      <UniqueIdentifier>{b257d9a5-2100-4b83-9a03-d28707827b1e}</UniqueIdentifier>
+    <Filter Include="src\core\ext\filters\http\message_compress">
+      <UniqueIdentifier>{cf8cb886-3020-e143-317e-730ff9bbddc3}</UniqueIdentifier>
    </Filter>
    <Filter Include="src\core\ext\filters\http\server">
      <UniqueIdentifier>{2c1e7897-6f69-f8b9-0b90-5c3fae59a48f}</UniqueIdentifier>