Land Recent QUIC changes.

net/tools/quic/quic_client_session_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_client_session.h"
 
 #include <vector>
 
 #include "net/base/ip_endpoint.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
@@ skipping 59 matching lines @@
   ASSERT_TRUE(stream);
   EXPECT_FALSE(session_->CreateOutgoingReliableStream());
 
   // Close a stream and ensure I can now open a new one.
   session_->CloseStream(stream->id());
   stream = session_->CreateOutgoingReliableStream();
   EXPECT_TRUE(stream);
 }
 
 TEST_F(QuicClientSessionTest, GoAwayReceived) {
-  // Initialize crypto before the client session will create a stream.
-  ASSERT_TRUE(session_->CryptoConnect());
-  // Simulate the server crypto handshake.
-  CryptoHandshakeMessage server_message;
-  server_message.set_tag(kSHLO);
-  session_->GetCryptoStream()->OnHandshakeMessage(server_message);
+  if (!Aes128Gcm12Encrypter::IsSupported()) {
+    LOG(INFO) << "AES GCM not supported. Test skipped.";
+    return;
+  }
+
+  CompleteCryptoHandshake();
 
   // After receiving a GoAway, I should no longer be able to create outgoing
   // streams.
   session_->OnGoAway(QuicGoAwayFrame(QUIC_PEER_GOING_AWAY, 1u, "Going away."));
   EXPECT_EQ(NULL, session_->CreateOutgoingReliableStream());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net