Land Recent QUIC Changes.

net/quic/quic_framer_test.cc

Index: net/quic/quic_framer_test.cc
diff --git a/net/quic/quic_framer_test.cc b/net/quic/quic_framer_test.cc
index 1aeb0d778b1a40c2832346f1328ea4702c588e18..09506b03492b9fda7206dcd2d4c1e7f6edaf1c2e 100644
--- a/net/quic/quic_framer_test.cc
+++ b/net/quic/quic_framer_test.cc
@@ -97,7 +97,7 @@ const size_t kPublicResetPacketRejectedSequenceNumberOffset =
 
 class TestEncrypter : public QuicEncrypter {
  public:
-  virtual ~TestEncrypter() {}
+  virtual ~TestEncrypter() OVERRIDE {}
   virtual bool SetKey(StringPiece key) OVERRIDE {
     return true;
   }
@@ -144,7 +144,7 @@ class TestEncrypter : public QuicEncrypter {
 
 class TestDecrypter : public QuicDecrypter {
  public:
-  virtual ~TestDecrypter() {}
+  virtual ~TestDecrypter() OVERRIDE {}
   virtual bool SetKey(StringPiece key) OVERRIDE {
     return true;
   }
@@ -192,7 +192,7 @@ class TestQuicVisitor : public ::net::QuicFramerVisitorInterface {
         accept_public_header_(true) {
   }
 
-  virtual ~TestQuicVisitor() {
+  virtual ~TestQuicVisitor() OVERRIDE {
     STLDeleteElements(&stream_frames_);
     STLDeleteElements(&ack_frames_);
     STLDeleteElements(&congestion_feedback_frames_);
@@ -3452,8 +3452,7 @@ TEST_P(QuicFramerTest, FecEntropyTest) {
   EXPECT_EQ(1 << 4, visitor_.header_->entropy_hash);
 };
 
-// http://crbug.com/331630. TODO(rtenneti): fix the uninitialized memory issue.
-TEST_P(QuicFramerTest, DISABLED_StopPacketProcessing) {
+TEST_P(QuicFramerTest, StopPacketProcessing) {
   unsigned char packet[] = {
     // public flags (8 byte guid)
     0x3C,
@@ -3506,6 +3505,7 @@ TEST_P(QuicFramerTest, DISABLED_StopPacketProcessing) {
   EXPECT_CALL(visitor, OnStreamFrame(_)).WillOnce(Return(false));
   EXPECT_CALL(visitor, OnAckFrame(_)).Times(0);
   EXPECT_CALL(visitor, OnPacketComplete());
+  EXPECT_CALL(visitor, OnUnauthenticatedPublicHeader(_)).WillOnce(Return(true));
 
   QuicEncryptedPacket encrypted(AsChars(packet), arraysize(packet), false);
   EXPECT_TRUE(framer_.ProcessPacket(encrypted));