Land Recent QUIC Changes

net/quic/quic_crypto_client_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_client_stream.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/aes_128_gcm_encrypter.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/simple_quic_framer.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 namespace test {
 namespace {
 
 const char kServerHostname[] = "localhost";
 
 class TestQuicVisitor : public NoOpFramerVisitor {
  public:
   TestQuicVisitor()
       : frame_valid_(false) {
   }
 
   // NoOpFramerVisitor
-  virtual void OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
+  virtual bool OnStreamFrame(const QuicStreamFrame& frame) OVERRIDE {
     frame_ = frame;
     frame_valid_ = true;
+    return true;
   }
 
   bool frame_valid() const {
     return frame_valid_;
   }
   QuicStreamFrame* frame() { return &frame_; }
 
  private:
   QuicStreamFrame frame_;
   bool frame_valid_;
@@ skipping 113 matching lines @@
 
   const QuicCryptoNegotiatedParameters& crypto_params(
       stream_.crypto_negotiated_params());
   EXPECT_EQ(kAESG, crypto_params.aead);
   EXPECT_EQ(kC255, crypto_params.key_exchange);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net