Land Recent QUIC Changes.

net/tools/quic/quic_client_session.cc

Index: net/tools/quic/quic_client_session.cc
diff --git a/net/tools/quic/quic_client_session.cc b/net/tools/quic/quic_client_session.cc
index f993908b6248a6b1fe76abe74e9efcbd46981815..02adb082378e4e041764c2d0d7b4f0f1fd61b16e 100644
--- a/net/tools/quic/quic_client_session.cc
+++ b/net/tools/quic/quic_client_session.cc
@@ -6,7 +6,6 @@
 
 #include "base/logging.h"
 #include "net/quic/crypto/crypto_protocol.h"
-#include "net/tools/quic/quic_reliable_client_stream.h"
 #include "net/tools/quic/quic_spdy_client_stream.h"
 
 using std::string;
@@ -26,7 +25,7 @@ QuicClientSession::QuicClientSession(
 QuicClientSession::~QuicClientSession() {
 }
 
-QuicReliableClientStream* QuicClientSession::CreateOutgoingReliableStream() {
+QuicSpdyClientStream* QuicClientSession::CreateOutgoingDataStream() {
   if (!crypto_stream_.encryption_established()) {
     DLOG(INFO) << "Encryption not active so no outgoing stream created.";
     return NULL;
@@ -41,7 +40,7 @@ QuicReliableClientStream* QuicClientSession::CreateOutgoingReliableStream() {
                << "Already received goaway.";
     return NULL;
   }
-  QuicReliableClientStream* stream
+  QuicSpdyClientStream* stream
       = new QuicSpdyClientStream(GetNextStreamId(), this);
   ActivateStream(stream);
   return stream;
@@ -59,7 +58,7 @@ int QuicClientSession::GetNumSentClientHellos() const {
   return crypto_stream_.num_sent_client_hellos();
 }
 
-ReliableQuicStream* QuicClientSession::CreateIncomingReliableStream(
+QuicDataStream* QuicClientSession::CreateIncomingDataStream(
     QuicStreamId id) {
   DLOG(ERROR) << "Server push not supported";
   return NULL;