diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-08 11:08:41 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-08 11:08:41 -0800 |
| commit | 239b7d4b0be55975e5fc0b62e28f3d3e2a54fa9b (patch) | |
| tree | 30c6d791eed6e7eaa8dfefe29b8b60651e56b059 /test/core/fling | |
| parent | 8f4fbb1c550c99e25f42ceafec3af92b34279db5 (diff) | |
| parent | 100e0a78ebc1ecfaefb57c5105506b3091d4b86c (diff) | |
Merge branch 'master' into gpr_review
Diffstat (limited to 'test/core/fling')
| -rw-r--r-- | test/core/fling/fling_stream_test.cc | 3 | ||||
| -rw-r--r-- | test/core/fling/fling_test.cc | 3 | ||||
| -rw-r--r-- | test/core/fling/server.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/test/core/fling/fling_stream_test.cc b/test/core/fling/fling_stream_test.cc index b5a5ce816e..6b29486f22 100644 --- a/test/core/fling/fling_stream_test.cc +++ b/test/core/fling/fling_stream_test.cc @@ -20,9 +20,10 @@ #include <string.h> #include <grpc/support/alloc.h> -#include <grpc/support/host_port.h> #include <grpc/support/string_util.h> #include <grpc/support/subprocess.h> + +#include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" #include "test/core/util/port.h" diff --git a/test/core/fling/fling_test.cc b/test/core/fling/fling_test.cc index 3792e45c42..ceb9851bc9 100644 --- a/test/core/fling/fling_test.cc +++ b/test/core/fling/fling_test.cc @@ -20,9 +20,10 @@ #include <string.h> #include <grpc/support/alloc.h> -#include <grpc/support/host_port.h> #include <grpc/support/string_util.h> #include <grpc/support/subprocess.h> + +#include "src/core/lib/gpr/host_port.h" #include "src/core/lib/gpr/string.h" #include "test/core/util/port.h" diff --git a/test/core/fling/server.cc b/test/core/fling/server.cc index f3a8a1ccf8..328bd4edbd 100644 --- a/test/core/fling/server.cc +++ b/test/core/fling/server.cc @@ -31,9 +31,10 @@ #include <grpc/support/alloc.h> #include <grpc/support/cmdline.h> -#include <grpc/support/host_port.h> #include <grpc/support/log.h> #include <grpc/support/time.h> + +#include "src/core/lib/gpr/host_port.h" #include "src/core/lib/profiling/timers.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/util/grpc_profiler.h" |