Land Recent QUIC Changes until 03/22/2015.

net/quic/quic_dispatcher.h

Index: net/quic/quic_dispatcher.h
diff --git a/net/quic/quic_dispatcher.h b/net/quic/quic_dispatcher.h
index c508cb8d914129e3301b60157e442c43e5c934cc..56967069e7a9023f6efd493863df06cc04847002 100644
--- a/net/quic/quic_dispatcher.h
+++ b/net/quic/quic_dispatcher.h
@@ -30,7 +30,7 @@ class QuicDispatcherPeer;
 class DeleteSessionsAlarm;
 class QuicConfig;
 class QuicCryptoServerConfig;
-class QuicSession;
+class QuicServerSession;
 
 class ProcessPacketInterface {
  public:
@@ -117,7 +117,7 @@ class QuicDispatcher : public QuicBlockedWriterInterface,
   void OnConnectionRemovedFromTimeWaitList(
       QuicConnectionId connection_id) override;
 
-  typedef base::hash_map<QuicConnectionId, QuicSession*> SessionMap;
+  typedef base::hash_map<QuicConnectionId, QuicServerSession*> SessionMap;
 
   // Deletes all sessions on the closed session list and clears the list.
   void DeleteSessions();
@@ -125,9 +125,10 @@ class QuicDispatcher : public QuicBlockedWriterInterface,
   const SessionMap& session_map() const { return session_map_; }
 
  protected:
-  virtual QuicSession* CreateQuicSession(QuicConnectionId connection_id,
-                                         const IPEndPoint& server_address,
-                                         const IPEndPoint& client_address);
+  virtual QuicServerSession* CreateQuicSession(
+      QuicConnectionId connection_id,
+      const IPEndPoint& server_address,
+      const IPEndPoint& client_address);
 
   // Called by |framer_visitor_| when the public header has been parsed.
   virtual bool OnUnauthenticatedPublicHeader(
@@ -138,9 +139,9 @@ class QuicDispatcher : public QuicBlockedWriterInterface,
   // certain simple processing rules.  This method may apply validity checks to
   // reject stray packets.  If the packet appears to be valid, it calls
   // CreateQuicSession to create a new session for the packet.  Returns the
-  // QuicSession that was created, or nullptr if the packet failed the validity
-  // checks.
-  virtual QuicSession* AdditionalValidityChecksThenCreateSession(
+  // QuicServerSession that was created, or nullptr if the packet failed the
+  // validity checks.
+  virtual QuicServerSession* AdditionalValidityChecksThenCreateSession(
       const QuicPacketPublicHeader& header,
       QuicConnectionId connection_id);
 
@@ -228,7 +229,7 @@ class QuicDispatcher : public QuicBlockedWriterInterface,
   scoped_ptr<QuicAlarm> delete_sessions_alarm_;
 
   // The list of closed but not-yet-deleted sessions.
-  std::list<QuicSession*> closed_session_list_;
+  std::list<QuicServerSession*> closed_session_list_;
 
   // The writer to write to the socket with.
   scoped_ptr<QuicServerPacketWriter> writer_;