Merge recent QUIC changes.

* Add a TODO to fix the in-memory time based fields in the inter arrival congestion feedback struct.  I'd fix them now, but I'm not sure if they'll even be used in their current form.  I'll leave it to patrick to actually implement when the code is ready.

  Merge internal change: 39803339

* Handling truncated ack packets.

  Merge internal change: 39972571

* Various small cleanups to QUIC code found while landing changes in Chrome.

  Merge internal change: 39980760

* Two more fixes for the ever-failing end to end test. Allow truncating connection close frames, since they're short data followed by a truncatable-ack. Check for closed streams in the client's GetStream, rather than closing the connection at an "unexpected" stream. Finally, fast fail in debug mode if we're asked to create a packet and can't: this should never happen since we should break data into small bits, and truncate acks.

  Merge internal change: 39999004

* Test truncated close along with truncate acks

  Merge internal change: 40032708

* Simplify the QuicFramer::Construct* API by returning a QuicPacket*, instead of returning a bool, and setting the packet in an outparam.

  This matches the API of the CryptoFramer.  (Yay, constency :>)

  Merge internal change: 40129101

* Minor cleanup of QuicFramerTest

  Merge internal change: 40130911

BUG=

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

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

1 files changed, 3 insertions, 5 deletions

diff --git a/net/quic/quic_connection_helper_test.cc b/net/quic/quic_connection_helper_test.cc
index 95068e0..7528869 100644
--- a/net/quic/quic_connection_helper_test.cc
+++ b/net/quic/quic_connection_helper_test.cc
@@ -184,11 +184,9 @@ class QuicConnectionHelperTest : public ::testing::Test {
                                        const QuicFrame& frame) {
     QuicFrames frames;
     frames.push_back(frame);
-    QuicPacket* packet;
-    framer_.ConstructFrameDataPacket(header_, frames, &packet);
-    QuicEncryptedPacket* encrypted = framer_.EncryptPacket(*packet);
-    delete packet;
-    return encrypted;
+    scoped_ptr<QuicPacket> packet(
+        framer_.ConstructFrameDataPacket(header_, frames));
+    return framer_.EncryptPacket(*packet);
   }
 
   QuicGuid guid_;