Land Recent QUIC Changes

net/quic/quic_crypto_stream.cc

Index: net/quic/quic_crypto_stream.cc
diff --git a/net/quic/quic_crypto_stream.cc b/net/quic/quic_crypto_stream.cc
index 712c8fd8021a9bfdf7cb8440d0b40917a84d7a74..d34e6eca97bc1fbb0a050bb3aaa48e8c36691e62 100644
--- a/net/quic/quic_crypto_stream.cc
+++ b/net/quic/quic_crypto_stream.cc
@@ -3,8 +3,15 @@
 // found in the LICENSE file.
 
 #include "net/quic/quic_crypto_stream.h"
+
+#include <string>
+
+#include "base/string_piece.h"
+#include "net/quic/crypto/crypto_handshake.h"
+#include "net/quic/quic_connection.h"
 #include "net/quic/quic_session.h"
 
+using std::string;
 using base::StringPiece;
 
 namespace net {
@@ -49,9 +56,9 @@ void QuicCryptoStream::SetHandshakeComplete(QuicErrorCode error) {
 
 void QuicCryptoStream::SendHandshakeMessage(
     const CryptoHandshakeMessage& message) {
-  scoped_ptr<QuicData> data(crypto_framer_.ConstructHandshakeMessage(message));
+  const QuicData& data = message.GetSerialized();
   // TODO(wtc): check the return value.
-  WriteData(string(data->data(), data->length()), false);
+  WriteData(string(data.data(), data.length()), false);
 }
 
 QuicNegotiatedParameters::QuicNegotiatedParameters()