Land Recent QUIC Changes.

net/tools/quic/quic_client_session.h

Index: net/tools/quic/quic_client_session.h
diff --git a/net/tools/quic/quic_client_session.h b/net/tools/quic/quic_client_session.h
index a73d721fef636b6b217c738d73bb9f24da44cd01..dcee15e4275f906889e9b6ef3a98b8929cb1a7b3 100644
--- a/net/tools/quic/quic_client_session.h
+++ b/net/tools/quic/quic_client_session.h
@@ -12,7 +12,7 @@
 #include "net/quic/quic_crypto_client_stream.h"
 #include "net/quic/quic_protocol.h"
 #include "net/quic/quic_session.h"
-#include "net/tools/quic/quic_reliable_client_stream.h"
+#include "net/tools/quic/quic_spdy_client_stream.h"
 
 namespace net {
 
@@ -21,8 +21,6 @@ class ReliableQuicStream;
 
 namespace tools {
 
-class QuicReliableClientStream;
-
 class QuicClientSession : public QuicSession {
  public:
   QuicClientSession(const std::string& server_hostname,
@@ -32,7 +30,7 @@ class QuicClientSession : public QuicSession {
   virtual ~QuicClientSession();
 
   // QuicSession methods:
-  virtual QuicReliableClientStream* CreateOutgoingReliableStream() OVERRIDE;
+  virtual QuicSpdyClientStream* CreateOutgoingDataStream() OVERRIDE;
   virtual QuicCryptoClientStream* GetCryptoStream() OVERRIDE;
 
   // Performs a crypto handshake with the server. Returns true if the crypto
@@ -46,8 +44,7 @@ class QuicClientSession : public QuicSession {
 
  protected:
   // QuicSession methods:
-  virtual ReliableQuicStream* CreateIncomingReliableStream(
-      QuicStreamId id) OVERRIDE;
+  virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE;
 
  private:
   QuicCryptoClientStream crypto_stream_;