Land Recent QUIC Changes.

Fix RttStats windowing so if no recent min rtt window is specified,
recent_min_rtt is the same as min_rtt.

recent_min_rtt is only used within BBR.

Merge internal change: 69034369
https://codereview.chromium.org/337433002/


Close QUIC connection with correct flow control error code, added a test
for this, and tidyup of a couple of other tests.

Close QUIC connection with correct flow control error code.

Merge internal change: 69012148
https://codereview.chromium.org/327393004/


Sync'ing DefaultRandom code with internal code.

Merge internal change: 69007888
https://codereview.chromium.org/335553002/


Fix some clang_tidy warnings in quic_connection_test.

Merge internal change: 69001838
https://codereview.chromium.org/335543002/


Refactor the Connection and Generator so the Creator is completely
encapsulated by the Generator.

Merge internal change: 69000832
https://codereview.chromium.org/329933003/


API changes to Write path Session on down for FEC protection.

Added |fec_protection| flag to data writes to QuicSession and
subclasses, down to QuicConnection and QuicPacketGenerator. This flag is
used by the packet generator to turn on FEC protection for the flagged
data.

Merge internal change: 68993204
https://codereview.chromium.org/335533002/


Wrap all tag printing in TagToString

Merge internal change: 68862495
https://codereview.chromium.org/332523005/


QuicStreamSequencer closes the connection on receipt of frames
overlapping with buffered data.

Merge internal change: 68858381
https://codereview.chromium.org/334603002/


Fixed lint errors: At least two spaces is best between code and comments

Merge internal change: 68847097
https://codereview.chromium.org/334583002/

R=rch@chromium.org

Review URL: https://codereview.chromium.org/331573002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276964 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 17 deletions

diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 816f679..5676fc1 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -24,7 +24,6 @@
 #include "net/quic/quic_sent_packet_manager.h"
 #include "net/quic/quic_server_id.h"
 #include "net/quic/test_tools/quic_connection_peer.h"
-#include "net/quic/test_tools/quic_packet_generator_peer.h"
 #include "net/quic/test_tools/quic_session_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/quic/test_tools/reliable_quic_stream_peer.h"
@@ -51,7 +50,6 @@ using base::WaitableEvent;
 using net::EpollServer;
 using net::test::GenerateBody;
 using net::test::QuicConnectionPeer;
-using net::test::QuicPacketGeneratorPeer;
 using net::test::QuicSessionPeer;
 using net::test::ReliableQuicStreamPeer;
 using net::test::kClientDataStreamId1;
@@ -639,6 +637,9 @@ TEST_P(EndToEndTest, DISABLED_LargePostZeroRTTFailure) {
 }
 
 TEST_P(EndToEndTest, LargePostFEC) {
+  // TODO(jri): Set FecPolicy to always protect on client_->stream_.
+  // This test currently does not do any FEC protection.
+
   // Connect without packet loss to avoid issues with losing handshake packets,
   // and then up the packet loss rate (b/10126687).
   ASSERT_TRUE(Initialize());
@@ -647,10 +648,10 @@ TEST_P(EndToEndTest, LargePostFEC) {
   client_->client()->WaitForCryptoHandshakeConfirmed();
   SetPacketLossPercentage(30);
 
-  // Turn on FEC protection.
-  QuicPacketGeneratorPeer::SwitchFecProtectionOn(
-      QuicConnectionPeer::GetPacketGenerator(
-          client_->client()->session()->connection()), 6);
+  // Enable FEC protection.
+  QuicPacketCreator* creator = QuicConnectionPeer::GetPacketCreator(
+      client_->client()->session()->connection());
+  creator->set_max_packets_per_fec_group(6);
 
   string body;
   GenerateBody(&body, 10240);
@@ -658,7 +659,6 @@ TEST_P(EndToEndTest, LargePostFEC) {
   HTTPMessage request(HttpConstants::HTTP_1_1,
                       HttpConstants::POST, "/foo");
   request.AddBody(body, true);
-
   EXPECT_EQ(kFooResponseBody, client_->SendCustomSynchronousRequest(request));
   VerifyCleanConnection(true);
 }
diff --git a/net/tools/quic/quic_spdy_server_stream_test.cc b/net/tools/quic/quic_spdy_server_stream_test.cc
index c4ba061..954f0a4 100644
--- a/net/tools/quic/quic_spdy_server_stream_test.cc
+++ b/net/tools/quic/quic_spdy_server_stream_test.cc
@@ -146,6 +146,7 @@ QuicConsumedData ConsumeAllData(
     const IOVector& data,
     QuicStreamOffset offset,
     bool fin,
+    FecProtection /*fec_protection_*/,
     QuicAckNotifier::DelegateInterface* /*ack_notifier_delegate*/) {
   return QuicConsumedData(data.TotalBufferSize(), fin);
 }
@@ -154,7 +155,7 @@ INSTANTIATE_TEST_CASE_P(Tests, QuicSpdyServerStreamTest,
                         ::testing::ValuesIn(QuicSupportedVersions()));
 
 TEST_P(QuicSpdyServerStreamTest, TestFraming) {
-  EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(AnyNumber()).
+  EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(AnyNumber()).
       WillRepeatedly(Invoke(ConsumeAllData));
 
   EXPECT_EQ(headers_string_.size(), stream_->ProcessData(
@@ -167,7 +168,7 @@ TEST_P(QuicSpdyServerStreamTest, TestFraming) {
 }
 
 TEST_P(QuicSpdyServerStreamTest, TestFramingOnePacket) {
-  EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(AnyNumber()).
+  EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(AnyNumber()).
       WillRepeatedly(Invoke(ConsumeAllData));
 
   string message = headers_string_ + body_;
@@ -184,7 +185,7 @@ TEST_P(QuicSpdyServerStreamTest, TestFramingExtraData) {
   string large_body = "hello world!!!!!!";
 
   // We'll automatically write out an error (headers + body)
-  EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(AnyNumber()).
+  EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(AnyNumber()).
       WillRepeatedly(Invoke(ConsumeAllData));
 
   EXPECT_EQ(headers_string_.size(), stream_->ProcessData(
@@ -210,10 +211,8 @@ TEST_P(QuicSpdyServerStreamTest, TestSendResponse) {
 
   InSequence s;
   EXPECT_CALL(session_,
-              WritevData(kHeadersStreamId, _, 0, false, NULL));
-
-
-  EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(1).
+              WritevData(kHeadersStreamId, _, 0, false, _, NULL));
+  EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(1).
       WillOnce(Return(QuicConsumedData(3, true)));
 
   QuicSpdyServerStreamPeer::SendResponse(stream_.get());
@@ -228,9 +227,8 @@ TEST_P(QuicSpdyServerStreamTest, TestSendErrorResponse) {
 
   InSequence s;
   EXPECT_CALL(session_,
-              WritevData(kHeadersStreamId, _, 0, false, NULL));
-
-  EXPECT_CALL(session_, WritevData(_, _, _, _, _)).Times(1).
+              WritevData(kHeadersStreamId, _, 0, false, _, NULL));
+  EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(1).
       WillOnce(Return(QuicConsumedData(3, true)));
 
   QuicSpdyServerStreamPeer::SendErrorResponse(stream_.get());