Land Recent QUIC Changes.

net/quic/quic_server_session.h

Index: net/quic/quic_server_session.h
diff --git a/net/quic/quic_server_session.h b/net/quic/quic_server_session.h
index 99bf26efcc8f735b3a0d326af62cc416ba7d97d8..49c03373ed0357f9acdbabf8e37f13b89e00fff0 100644
--- a/net/quic/quic_server_session.h
+++ b/net/quic/quic_server_session.h
@@ -39,7 +39,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 {
@@ -62,6 +62,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;