diff options
author | Vijay Pai <vpai@google.com> | 2016-03-28 11:09:21 -0700 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2016-03-28 11:09:21 -0700 |
commit | d0facacece41cb4ae887cb565d8d8447249d4adb (patch) | |
tree | f90fa102c47dd9972f15258a1af3ae0e6e6c3e60 /test/cpp/common/secure_auth_context_test.cc | |
parent | 761f7bc3e4cb87af5521eae8803d27dbee64c958 (diff) | |
parent | e5cc05b5c6cee7026a0d28d39925621451506820 (diff) |
Merge branch 'master' into make_unix_sockets_great_again
Diffstat (limited to 'test/cpp/common/secure_auth_context_test.cc')
-rw-r--r-- | test/cpp/common/secure_auth_context_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/cpp/common/secure_auth_context_test.cc b/test/cpp/common/secure_auth_context_test.cc index 11de646999..c421910cba 100644 --- a/test/cpp/common/secure_auth_context_test.cc +++ b/test/cpp/common/secure_auth_context_test.cc @@ -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 @@ -31,14 +31,14 @@ * */ -#include <grpc/grpc_security.h> +#include "src/cpp/common/secure_auth_context.h" #include <grpc++/security/auth_context.h> +#include <grpc/grpc_security.h> #include <gtest/gtest.h> -#include "src/cpp/common/secure_auth_context.h" #include "test/cpp/util/string_ref_helper.h" extern "C" { -#include "src/core/security/security_context.h" +#include "src/core/lib/security/security_context.h" } using grpc::testing::ToString; |