Land Recent QUIC changes.

net/quic/test_tools/quic_test_utils.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/test_tools/quic_test_utils.h"
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ skipping 236 matching lines @@
     HasRetransmittableData retransmittable) {
   packets_.push_back(packet);
   QuicEncryptedPacket* encrypted =
       framer_.EncryptPacket(level, sequence_number, *packet);
   encrypted_packets_.push_back(encrypted);
   return true;
 }
 
 MockSession::MockSession(QuicConnection* connection, bool is_server)
     : QuicSession(connection, DefaultQuicConfig(), is_server) {
-  ON_CALL(*this, WriteData(_, _, _, _))
+  ON_CALL(*this, WritevData(_, _, _, _, _))
       .WillByDefault(testing::Return(QuicConsumedData(0, false)));
 }
 
 MockSession::~MockSession() {
 }
 
 TestSession::TestSession(QuicConnection* connection,
                          const QuicConfig& config,
                          bool is_server)
     : QuicSession(connection, config, is_server),
@@ skipping 174 matching lines @@
   data.AppendToString(&data_);
   return true;
 }
 
 void TestDecompressorVisitor::OnDecompressionError() {
   error_ = true;
 }
 
 }  // namespace test
 }  // namespace net