summaryrefslogtreecommitdiffstats
path: root/net/quic/crypto/crypto_server_test.cc
diff options
context:
space:
mode:
authorrch <rch@chromium.org>2015-03-29 20:25:36 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-30 03:26:25 +0000
commitbbb4b1a2952870b63c6c9fc644ffe338530426ef (patch)
tree091a51b242f9cde0ad1fadc3937e654aeaf6de9a /net/quic/crypto/crypto_server_test.cc
parent3a8aa73ced3ba219abe3eb1a58e4ff2005eab86d (diff)
downloadchromium_src-bbb4b1a2952870b63c6c9fc644ffe338530426ef.zip
chromium_src-bbb4b1a2952870b63c6c9fc644ffe338530426ef.tar.gz
chromium_src-bbb4b1a2952870b63c6c9fc644ffe338530426ef.tar.bz2
Use IPAddressNumber instead of IPEndPoint in QuicCryptoServerConfig
to minimized diffs with internal code. Review URL: https://codereview.chromium.org/1046683002 Cr-Commit-Position: refs/heads/master@{#322735}
Diffstat (limited to 'net/quic/crypto/crypto_server_test.cc')
-rw-r--r--net/quic/crypto/crypto_server_test.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/net/quic/crypto/crypto_server_test.cc b/net/quic/crypto/crypto_server_test.cc
index b140e23..9aa1662 100644
--- a/net/quic/crypto/crypto_server_test.cc
+++ b/net/quic/crypto/crypto_server_test.cc
@@ -194,7 +194,8 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
void RunValidate(
const CryptoHandshakeMessage& message,
ValidateClientHelloResultCallback* cb) {
- config_.ValidateClientHello(message, client_address_, &clock_, cb);
+ config_.ValidateClientHello(message, client_address_.address(), &clock_,
+ cb);
}
void ShouldFailMentioning(const char* error_substr,
@@ -208,7 +209,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
const CryptoHandshakeMessage& message,
bool* called) {
config_.ValidateClientHello(
- message, client_address_, &clock_,
+ message, client_address_.address(), &clock_,
new ValidateCallback(this, false, error_substr, called));
}
@@ -216,7 +217,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
const ValidateCallback::Result& result,
bool should_succeed,
const char* error_substr) {
- IPEndPoint server_ip;
+ IPAddressNumber server_ip;
string error_details;
QuicErrorCode error = config_.ProcessClientHello(
result, 1 /* ConnectionId */, server_ip, client_address_,
@@ -262,7 +263,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
size_t expected_count) {
const uint32* reject_reasons;
size_t num_reject_reasons;
- static_assert(sizeof(QuicTag) == sizeof(uint32), "header out of sync");
+ COMPILE_ASSERT(sizeof(QuicTag) == sizeof(uint32), header_out_of_sync);
QuicErrorCode error_code = out_.GetTaglist(kRREJ, &reject_reasons,
&num_reject_reasons);
ASSERT_EQ(QUIC_NO_ERROR, error_code);