diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-19 14:53:42 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-19 14:53:42 -0700 |
| commit | eb35a1d16bf7ccdb3e4006203ad63e5865454652 (patch) | |
| tree | e7445fb61be3ff9b3d8a2ed9a8a5b5a4c544609d /test/core/end2end/fixtures/h2_http_proxy.c | |
| parent | 15195741d7758a80bcf901e7db05b3c57654c4a3 (diff) | |
| parent | 20e77f27b0cf2cb1305df21a91e6a51d9a4171d1 (diff) | |
Merge remote-tracking branch 'upstream/master' into rename_client_config
Diffstat (limited to 'test/core/end2end/fixtures/h2_http_proxy.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_http_proxy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/core/end2end/fixtures/h2_http_proxy.c b/test/core/end2end/fixtures/h2_http_proxy.c index a675a11f66..2acc06f549 100644 --- a/test/core/end2end/fixtures/h2_http_proxy.c +++ b/test/core/end2end/fixtures/h2_http_proxy.c @@ -42,7 +42,7 @@ #include <grpc/support/sync.h> #include <grpc/support/thd.h> #include <grpc/support/useful.h> -#include "src/core/ext/client_config/client_channel.h" +#include "src/core/ext/client_channel/client_channel.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/channel/http_server_filter.h" @@ -75,7 +75,9 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( } void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { + grpc_channel_args *client_args, + const char *query_args) { + GPR_ASSERT(query_args == NULL); fullstack_fixture_data *ffd = f->fixture_data; char *proxy_uri; gpr_asprintf(&proxy_uri, "http://%s", |