Land Recent QUIC Changes

Fix a merging error in the previous checkin.

visitor_ is now a scoped_ptr so the visitor_(NULL) initializer
was removed.

Merge internal change: 43199271

More cleanups that fell out of recent Chrome merges.

Merge internal change: 43195667

Implement framing for version flag and field.

Merge internal change: 43155434

Reduce the usage of magic numbers by moving most of them to quic_protocol.h

Merge internal change: 43133922

Expose functions to calculate offsets and packet sizes from quic_protocol.h.

Merge internal change: 43123088

Various cleanups from landing recent changes in Chrome.

Merge internal change: 43060871

Moving the quic session's write blocked list over such that we won't add a given session multiple times.

Merge internal change: 42920586

Factoring our blocked list out into a separate class.

Merge internal change: 42919835

R=jar@chromium.org


Review URL: https://chromiumcodereview.appspot.com/12374030

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

3 files changed, 18 insertions, 4 deletions

diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index 0f265a5..9faec9a 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -8,8 +8,10 @@
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_utils.h"
+#include "net/quic/crypto/null_encrypter.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
+#include "net/quic/quic_packet_creator.h"
 
 using std::max;
 using std::min;
@@ -245,7 +247,8 @@ static QuicPacket* ConstructPacketFromHandshakeMessage(
     const CryptoHandshakeMessage& message) {
   CryptoFramer crypto_framer;
   scoped_ptr<QuicData> data(crypto_framer.ConstructHandshakeMessage(message));
-  QuicFramer quic_framer(QuicDecrypter::Create(kNULL),
+  QuicFramer quic_framer(kQuicVersion1,
+                         QuicDecrypter::Create(kNULL),
                          QuicEncrypter::Create(kNULL));
 
   QuicPacketHeader header;
@@ -301,6 +304,11 @@ QuicPacket* ConstructServerHelloPacket(QuicGuid guid,
   return ConstructPacketFromHandshakeMessage(guid, server_hello);
 }
 
+size_t GetPacketLengthForOneStream(bool include_version, size_t payload) {
+  return NullEncrypter().GetCiphertextSize(payload) +
+      QuicPacketCreator::StreamFramePacketOverhead(1, include_version);
+}
+
 QuicPacketEntropyHash TestEntropyCalculator::ReceivedEntropyHash(
     QuicPacketSequenceNumber sequence_number) const {
   return 1u;
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index 7724d16..199ea02 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -45,6 +45,10 @@ QuicPacket* ConstructServerHelloPacket(QuicGuid guid,
                                        const QuicClock* clock,
                                        QuicRandom* random_generator);
 
+// 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);
+
 class MockFramerVisitor : public QuicFramerVisitorInterface {
  public:
   MockFramerVisitor();
@@ -131,9 +135,9 @@ class FramerVisitorCapturingFrames : public NoOpFramerVisitor {
       const QuicConnectionCloseFrame& frame) OVERRIDE;
   virtual void OnGoAwayFrame(const QuicGoAwayFrame& frame) OVERRIDE;
 
-  size_t frame_count() { return frame_count_; }
+  size_t frame_count() const { return frame_count_; }
   QuicPacketHeader* header() { return &header_; }
-  const std::vector<QuicStreamFrame>* stream_frames() {
+  const std::vector<QuicStreamFrame>* stream_frames() const {
     return &stream_frames_;
   }
   QuicAckFrame* ack() { return ack_.get(); }
diff --git a/net/quic/test_tools/simple_quic_framer.cc b/net/quic/test_tools/simple_quic_framer.cc
index dc69642..e477a93 100644
--- a/net/quic/test_tools/simple_quic_framer.cc
+++ b/net/quic/test_tools/simple_quic_framer.cc
@@ -113,7 +113,9 @@ class SimpleFramerVisitor : public QuicFramerVisitorInterface {
 };
 
 SimpleQuicFramer::SimpleQuicFramer()
-    : framer_(QuicDecrypter::Create(kNULL), QuicEncrypter::Create(kNULL)) {
+    : framer_(kQuicVersion1,
+              QuicDecrypter::Create(kNULL),
+              QuicEncrypter::Create(kNULL)) {
 }
 
 SimpleQuicFramer::~SimpleQuicFramer() {