Land Recent QUIC Changes.

net/quic/test_tools/quic_connection_peer.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_connection_peer.h"
 
 #include "base/stl_util.h"
 #include "net/quic/congestion_control/receive_algorithm_interface.h"
 #include "net/quic/congestion_control/send_algorithm_interface.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_packet_writer.h"
 #include "net/quic/quic_received_packet_manager.h"
 #include "net/quic/test_tools/quic_framer_peer.h"
+#include "net/quic/test_tools/quic_packet_generator_peer.h"
 #include "net/quic/test_tools/quic_sent_packet_manager_peer.h"
 
 namespace net {
 namespace test {
 
 // static
 void QuicConnectionPeer::SendAck(QuicConnection* connection) {
   connection->SendAck();
 }
 
@@ skipping 19 matching lines @@
 
 // static
 QuicConnectionVisitorInterface* QuicConnectionPeer::GetVisitor(
     QuicConnection* connection) {
   return connection->visitor_;
 }
 
 // static
 QuicPacketCreator* QuicConnectionPeer::GetPacketCreator(
     QuicConnection* connection) {
-  return &connection->packet_creator_;
+  return QuicPacketGeneratorPeer::GetPacketCreator(
+      &connection->packet_generator_);
 }
 
 // static
 QuicPacketGenerator* QuicConnectionPeer::GetPacketGenerator(
     QuicConnection* connection) {
   return &connection->packet_generator_;
 }
 
 // static
 QuicSentPacketManager* QuicConnectionPeer::GetSentPacketManager(
@@ skipping 158 matching lines @@
 }
 
 // static
 void QuicConnectionPeer::SetSupportedVersions(QuicConnection* connection,
                                               QuicVersionVector versions) {
   connection->framer_.SetSupportedVersions(versions);
 }
 
 }  // namespace test
 }  // namespace net