Land Recent QUIC Changes

net/quic/quic_crypto_server_stream_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/quic/quic_crypto_server_stream.h"
 
 #include <map>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/aes_128_gcm_encrypter.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_server_config.h"
 #include "net/quic/crypto/crypto_utils.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_crypto_client_stream.h"
-#include "net/quic/quic_crypto_server_stream.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 class QuicConnection;
 class ReliableQuicStream;
 }  // namespace net
 
 using testing::_;
 
 namespace net {
 namespace test {
 namespace {
 
 // TODO(agl): Use rch's utility class for parsing a message when committed.
 class TestQuicVisitor : public NoOpFramerVisitor {
  public:
   TestQuicVisitor() {}
 
   // NoOpFramerVisitor
-  virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
+  virtual bool OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
     frame_ = frame;
+    return true;
   }
 
   QuicStreamFrame* frame() { return &frame_; }
 
  private:
   QuicStreamFrame frame_;
 
   DISALLOW_COPY_AND_ASSIGN(TestQuicVisitor);
 };
 
@@ skipping 60 matching lines @@
 
   EXPECT_FALSE(stream_.handshake_complete());
 }
 
 TEST_F(QuicCryptoServerStreamTest, ConnectedAfterCHLO) {
   if (!Aes128GcmEncrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
+  // CompleteCryptoHandshake returns the number of client hellos sent. This
+  // test should send:
+  //   * One to get a source-address token.
+  //   * One to complete the handshake.
+  // TODO(rtenneti): Until we set the crypto_config.SetProofVerifier to enable
+  // ProofVerifier in CryptoTestUtils::HandshakeWithFakeClient, we would not
+  // have sent the following client hello.
+  //   * One to get the server's certificates
   EXPECT_EQ(2, CompleteCryptoHandshake());
   EXPECT_TRUE(stream_.handshake_complete());
 }
 
 TEST_F(QuicCryptoServerStreamTest, ZeroRTT) {
   if (!Aes128GcmEncrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
 
@@ skipping 85 matching lines @@
   message_.set_tag(kSHLO);
   ConstructHandshakeMessage();
   EXPECT_CALL(*connection_, SendConnectionClose(
       QUIC_INVALID_CRYPTO_MESSAGE_TYPE));
   stream_.ProcessData(message_data_->data(), message_data_->length());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net