Land Recent QUIC Changes

net/quic/quic_crypto_stream.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // 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 {
 
 QuicCryptoStream::QuicCryptoStream(QuicSession* session)
     : ReliableQuicStream(kCryptoStreamId, session),
       handshake_complete_(false) {
   crypto_framer_.set_visitor(this);
 }
 
@@ skipping 24 matching lines @@
   session()->connection()->SendConnectionCloseWithDetails(error, details);
 }
 
 void QuicCryptoStream::SetHandshakeComplete(QuicErrorCode error) {
   handshake_complete_ = true;
   session()->OnCryptoHandshakeComplete(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()
     : idle_connection_state_lifetime(QuicTime::Delta::Zero()),
       keepalive_timeout(QuicTime::Delta::Zero()) {
 }
 
 QuicConfig::QuicConfig()
     : idle_connection_state_lifetime(QuicTime::Delta::Zero()),
       keepalive_timeout(QuicTime::Delta::Zero()) {
@@ skipping 74 matching lines @@
       if (error_details) {
         *error_details = "Bad KATO";
       }
       return error;
   }
 
   return QUIC_NO_ERROR;
 }
 
 }  // namespace net