diff options
author | 2016-01-11 10:33:39 -0800 | |
---|---|---|
committer | 2016-01-11 10:33:39 -0800 | |
commit | 5bd6f2e190f7cdf2857bff27cd4da860acf72aef (patch) | |
tree | 780fa9aeaaeafe60ede359b12a49f76935cc1381 /test/cpp/qps/client_sync.cc | |
parent | b30bc2aad6438cf89c11569fac436c83a7133f4b (diff) | |
parent | b3a6787bd52a9fe4a68114cbe5cd45926287da17 (diff) |
Merge branch 'master' into bbuf
Diffstat (limited to 'test/cpp/qps/client_sync.cc')
-rw-r--r-- | test/cpp/qps/client_sync.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/cpp/qps/client_sync.cc b/test/cpp/qps/client_sync.cc index c27ca7a623..54cdf390d7 100644 --- a/test/cpp/qps/client_sync.cc +++ b/test/cpp/qps/client_sync.cc @@ -52,14 +52,12 @@ #include <grpc/support/time.h> #include <gtest/gtest.h> +#include "src/core/profiling/timers.h" +#include "src/proto/grpc/testing/services.grpc.pb.h" #include "test/cpp/qps/client.h" #include "test/cpp/qps/histogram.h" #include "test/cpp/qps/interarrival.h" #include "test/cpp/qps/timer.h" -#include "test/cpp/util/create_test_channel.h" -#include "test/proto/benchmarks/services.grpc.pb.h" - -#include "src/core/profiling/timers.h" namespace grpc { namespace testing { |