Land Recent QUIC Changes.

net/tools/quic/quic_server_session.h

Index: net/tools/quic/quic_server_session.h
diff --git a/net/tools/quic/quic_server_session.h b/net/tools/quic/quic_server_session.h
index e05ba161d4f0a254b84f6e6cac41acdfc08c46c4..7c4dfb294f40662444e75c95dc63e49dbca4cce9 100644
--- a/net/tools/quic/quic_server_session.h
+++ b/net/tools/quic/quic_server_session.h
@@ -40,7 +40,7 @@ class QuicServerSessionVisitor {
 
   virtual void OnConnectionClosed(QuicConnectionId connection_id,
                                   QuicErrorCode error) = 0;
-  virtual void OnWriteBlocked(QuicBlockedWriterInterface* writer) = 0;
+  virtual void OnWriteBlocked(QuicBlockedWriterInterface* blocked_writer) = 0;
 };
 
 class QuicServerSession : public QuicSession {
@@ -61,6 +61,9 @@ class QuicServerSession : public QuicSession {
     return crypto_stream_.get();
   }
 
+  // Override base class to process FEC config received from client.
+  virtual void OnConfigNegotiated() OVERRIDE;
+
  protected:
   // QuicSession methods:
   virtual QuicDataStream* CreateIncomingDataStream(QuicStreamId id) OVERRIDE;