diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-01-24 10:58:25 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-01-24 10:58:25 -0800 |
| commit | ea8027a0b1b5ca2ba2e29f9924d5c164cc75aba1 (patch) | |
| tree | a8409e75cbf9966c0aad4fc5df5d8af33dc59fa6 /test/core/bad_client | |
| parent | 7cbbee745e84d714f826e54fdbc93499341e7fa3 (diff) | |
| parent | 5e7eed29ed747a24a91c3d202066e64d0478d5db (diff) | |
Merge branch 'master' into badclient
Diffstat (limited to 'test/core/bad_client')
| -rw-r--r-- | test/core/bad_client/bad_client.cc | 4 | ||||
| -rw-r--r-- | test/core/bad_client/tests/large_metadata.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/core/bad_client/bad_client.cc b/test/core/bad_client/bad_client.cc index 140c43fec9..0f586f14f1 100644 --- a/test/core/bad_client/bad_client.cc +++ b/test/core/bad_client/bad_client.cc @@ -28,10 +28,10 @@ #include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_stack.h" +#include "src/core/lib/gpr/murmur_hash.h" +#include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/support/murmur_hash.h" -#include "src/core/lib/support/string.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/bad_client/tests/large_metadata.cc b/test/core/bad_client/tests/large_metadata.cc index 429af8c955..d534753f53 100644 --- a/test/core/bad_client/tests/large_metadata.cc +++ b/test/core/bad_client/tests/large_metadata.cc @@ -22,7 +22,7 @@ #include <grpc/support/alloc.h> #include <grpc/support/string_util.h> -#include "src/core/lib/support/string.h" +#include "src/core/lib/gpr/string.h" #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" |