| Index: net/quic/chromium/quic_network_transaction_unittest.cc
|
| diff --git a/net/quic/chromium/quic_network_transaction_unittest.cc b/net/quic/chromium/quic_network_transaction_unittest.cc
|
| index 7aeea5a2be916b73a76be38e67ca49f1525326ec..fddd45ccb564c06979829224b8ac57507497e1f2 100644
|
| --- a/net/quic/chromium/quic_network_transaction_unittest.cc
|
| +++ b/net/quic/chromium/quic_network_transaction_unittest.cc
|
| @@ -488,7 +488,7 @@ class QuicNetworkTransactionTest
|
| ASSERT_TRUE(response->headers.get() != nullptr);
|
| EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
|
| EXPECT_TRUE(response->was_fetched_via_spdy);
|
| - EXPECT_TRUE(response->was_npn_negotiated);
|
| + EXPECT_TRUE(response->was_alpn_negotiated);
|
| EXPECT_EQ(HttpResponseInfo::CONNECTION_INFO_QUIC1_SPDY3,
|
| response->connection_info);
|
| }
|
| @@ -505,7 +505,7 @@ class QuicNetworkTransactionTest
|
| ASSERT_TRUE(response->headers.get() != nullptr);
|
| EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
|
| EXPECT_FALSE(response->was_fetched_via_spdy);
|
| - EXPECT_FALSE(response->was_npn_negotiated);
|
| + EXPECT_FALSE(response->was_alpn_negotiated);
|
| EXPECT_EQ(HttpResponseInfo::CONNECTION_INFO_HTTP1_1,
|
| response->connection_info);
|
| }
|
| @@ -2018,7 +2018,7 @@ TEST_P(QuicNetworkTransactionTest, RstSteamErrorHandling) {
|
| ASSERT_TRUE(response->headers.get() != nullptr);
|
| EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
|
| EXPECT_TRUE(response->was_fetched_via_spdy);
|
| - EXPECT_TRUE(response->was_npn_negotiated);
|
| + EXPECT_TRUE(response->was_alpn_negotiated);
|
| EXPECT_EQ(HttpResponseInfo::CONNECTION_INFO_QUIC1_SPDY3,
|
| response->connection_info);
|
|
|
| @@ -2963,7 +2963,7 @@ class QuicNetworkTransactionWithDestinationTest
|
| ASSERT_TRUE(response->headers.get() != nullptr);
|
| EXPECT_EQ("HTTP/1.1 200 OK", response->headers->GetStatusLine());
|
| EXPECT_TRUE(response->was_fetched_via_spdy);
|
| - EXPECT_TRUE(response->was_npn_negotiated);
|
| + EXPECT_TRUE(response->was_alpn_negotiated);
|
| EXPECT_EQ(HttpResponseInfo::CONNECTION_INFO_QUIC1_SPDY3,
|
| response->connection_info);
|
| EXPECT_EQ(443, response->socket_address.port());
|
|
|