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 e73e61d2a3c9770a01d9d94131491f85792a4357..d1ad84bff3c8d6abf0207c0d9600883c49f9ccf4 100644
--- a/net/quic/quic_crypto_stream.cc
+++ b/net/quic/quic_crypto_stream.cc
@@ -33,8 +33,8 @@ void QuicCryptoStream::OnHandshakeMessage(
   session()->OnCryptoHandshakeMessageReceived(message);
 }
 
-uint32 QuicCryptoStream::ProcessData(const char* data,
-                                     uint32 data_len) {
+uint32 QuicCryptoStream::ProcessRawData(const char* data,
+                                        uint32 data_len) {
   // Do not process handshake messages after the handshake is confirmed.
   if (handshake_confirmed()) {
     CloseConnection(QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE);
@@ -47,6 +47,10 @@ uint32 QuicCryptoStream::ProcessData(const char* data,
   return data_len;
 }
 
+QuicPriority QuicCryptoStream::EffectivePriority() const {
+  return 0;
+}
+
 void QuicCryptoStream::SendHandshakeMessage(
     const CryptoHandshakeMessage& message) {
   session()->OnCryptoHandshakeMessageSent(message);
@@ -55,7 +59,7 @@ void QuicCryptoStream::SendHandshakeMessage(
   // any other frames in a single packet.
   session()->connection()->Flush();
   // TODO(wtc): check the return value.
-  WriteData(string(data.data(), data.length()), false);
+  WriteOrBufferData(string(data.data(), data.length()), false);
   session()->connection()->Flush();
 }