diff options
author | Craig Tiller <ctiller@google.com> | 2016-04-06 10:02:26 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-04-06 10:02:26 -0700 |
commit | 0ea9fceb24f8fc618d4cbdcdc2bc49fea9de06fe (patch) | |
tree | 8f0f8ad45b364bc2d29f3033bd756799819bff1c /test/cpp/util/create_test_channel.h | |
parent | 0d2a0ae7c5a2603976ee0133bcd306afe7f63e08 (diff) | |
parent | 8dbf476ac369c6f9cceb6f76a70fa739efce7e9b (diff) |
Merge github.com:grpc/grpc into cleaner-posix3
Diffstat (limited to 'test/cpp/util/create_test_channel.h')
-rw-r--r-- | test/cpp/util/create_test_channel.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/test/cpp/util/create_test_channel.h b/test/cpp/util/create_test_channel.h index b50d653de3..4ff666dc1b 100644 --- a/test/cpp/util/create_test_channel.h +++ b/test/cpp/util/create_test_channel.h @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -53,6 +53,12 @@ std::shared_ptr<Channel> CreateTestChannel( bool enable_ssl, bool use_prod_roots, const std::shared_ptr<CallCredentials>& creds); +std::shared_ptr<Channel> CreateTestChannel( + const grpc::string& server, const grpc::string& override_hostname, + bool enable_ssl, bool use_prod_roots, + const std::shared_ptr<CallCredentials>& creds, + const ChannelArguments& args); + } // namespace grpc #endif // GRPC_TEST_CPP_UTIL_CREATE_TEST_CHANNEL_H |