Land Recent QUIC Changes.

net/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/quic/quic_client_session.h"
 
 #include <vector>
 
 #include "base/rand_util.h"
 #include "net/base/capturing_net_log.h"
@@ skipping 19 matching lines @@
 
 class TestPacketWriter : public QuicDefaultPacketWriter {
  public:
   TestPacketWriter() {
   }
 
   // QuicPacketWriter
   virtual WriteResult WritePacket(
       const char* buffer, size_t buf_len,
       const IPAddressNumber& self_address,
-      const IPEndPoint& peer_address,
-      QuicBlockedWriterInterface* blocked_writer) OVERRIDE {
+      const IPEndPoint& peer_address) OVERRIDE {
     QuicFramer framer(QuicSupportedVersions(), QuicTime::Zero(), true);
     FramerVisitorCapturingFrames visitor;
     framer.set_visitor(&visitor);
     QuicEncryptedPacket packet(buffer, buf_len);
     EXPECT_TRUE(framer.ProcessPacket(packet));
     header_ = *visitor.header();
     return WriteResult(WRITE_STATUS_OK, packet.length());
   }
 
   virtual bool IsWriteBlockedDataBuffered() const OVERRIDE {
@@ skipping 106 matching lines @@
 
   // 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_.CreateOutgoingDataStream());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net