Land Recent QUIC Changes until 05/13/2015

net/quic/crypto/quic_crypto_client_config_test.cc

Index: net/quic/crypto/quic_crypto_client_config_test.cc
diff --git a/net/quic/crypto/quic_crypto_client_config_test.cc b/net/quic/crypto/quic_crypto_client_config_test.cc
index bf3a34316334a4daabffc969362e73b6a6f39061..348f8f90e4d6414afb1c011dc8d79afce71404f2 100644
--- a/net/quic/crypto/quic_crypto_client_config_test.cc
+++ b/net/quic/crypto/quic_crypto_client_config_test.cc
@@ -370,11 +370,10 @@ TEST(QuicCryptoClientConfigTest, ProcessStatelessReject) {
   QuicCryptoNegotiatedParameters out_params;
   string error;
   QuicCryptoClientConfig config;
-  EXPECT_EQ(
-      QUIC_CRYPTO_HANDSHAKE_STATELESS_REJECT,
-      config.ProcessRejection(rej, QuicWallTime::FromUNIXSeconds(0), &cached,
-                              true,  // is_https
-                              &out_params, &error));
+  EXPECT_EQ(QUIC_NO_ERROR, config.ProcessRejection(
+                               rej, QuicWallTime::FromUNIXSeconds(0), &cached,
+                               true,  // is_https
+                               &out_params, &error));
   EXPECT_TRUE(cached.has_server_designated_connection_id());
   EXPECT_EQ(kConnectionId, cached.GetNextServerDesignatedConnectionId());
 }