diff options
| author |  Bogdan Drutu <bdrutu@google.com> | 2016-04-06 14:09:59 -0700 |
|---|---|---|
| committer | Bogdan Drutu <bdrutu@google.com> | 2016-04-06 14:09:59 -0700 |
| commit | b40693ef995fdb44149ef146ccb21f687bd9fd04 (patch) | |
| tree | 82e8f842e18c81c90562aeb8dbfc170d01d83f1d /test/cpp/util/create_test_channel.h | |
| parent | 552aecd0e2045c9e38333e3c5f112c1a7f6c35cc (diff) | |
| parent | 39a96967f1b003391b02317bf7c6fb003edc4722 (diff) | |
Merge remote-tracking branch 'upstream/master'
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 |