Land Recent QUIC changes.

net/quic/test_tools/quic_test_utils.h

Index: net/quic/test_tools/quic_test_utils.h
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index 8fbf05445d86c603287525b4c683ffbed338536e..e694982d77b24eed44b2611bb74d803154228378 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -37,10 +37,14 @@ void CompareQuicDataWithHexError(const std::string& description,
 
 // Returns the length of the QuicPacket that will be created if it contains
 // a stream frame that has |payload| bytes.
-size_t GetPacketLengthForOneStream(bool include_version, size_t payload);
+size_t GetPacketLengthForOneStream(
+    bool include_version, InFecGroup is_in_fec_group, size_t payload);
 
 string SerializeUncompressedHeaders(const SpdyHeaderBlock& headers);
 
+// Returns QuicConfig set to default values.
+QuicConfig DefaultQuicConfig();
+
 class MockFramerVisitor : public QuicFramerVisitorInterface {
  public:
   MockFramerVisitor();
@@ -318,10 +322,9 @@ class MockSendAlgorithm : public SendAlgorithmInterface {
   MockSendAlgorithm();
   virtual ~MockSendAlgorithm();
 
-  MOCK_METHOD4(OnIncomingQuicCongestionFeedbackFrame,
+  MOCK_METHOD3(OnIncomingQuicCongestionFeedbackFrame,
                void(const QuicCongestionFeedbackFrame&,
                     QuicTime feedback_receive_time,
-                    QuicBandwidth sent_bandwidth,
                     const SentPacketsMap&));
   MOCK_METHOD3(OnIncomingAck,
                void(QuicPacketSequenceNumber, QuicByteCount, QuicTime::Delta));