Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.h

Index: net/tools/quic/quic_dispatcher.h
diff --git a/net/tools/quic/quic_dispatcher.h b/net/tools/quic/quic_dispatcher.h
index 0cc978be240be0a82b7fe923040be400a7f695ff..1c010abbaa1e0efcf6ffd1f8948ab25dbc37e341 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -71,6 +71,8 @@ class QuicDispatcher : public QuicPacketWriter, public QuicSessionOwner {
       const IPEndPoint& peer_address,
       QuicBlockedWriterInterface* writer) OVERRIDE;
   virtual bool IsWriteBlockedDataBuffered() const OVERRIDE;
+  virtual bool IsWriteBlocked() const OVERRIDE;
+  virtual void SetWritable() OVERRIDE;
 
   // Process the incoming packet by creating a new session, passing it to
   // an existing session, or passing it to the TimeWaitListManager.
@@ -105,10 +107,6 @@ class QuicDispatcher : public QuicPacketWriter, public QuicSessionOwner {
 
   const SessionMap& session_map() const { return session_map_; }
 
-  // Uses the specified |writer| instead of QuicSocketUtils and takes ownership
-  // of writer.
-  void UseWriter(QuicPacketWriter* writer);
-
   WriteBlockedList* write_blocked_list() { return &write_blocked_list_; }
 
  protected:
@@ -175,10 +173,6 @@ class QuicDispatcher : public QuicPacketWriter, public QuicSessionOwner {
   // The connection for client-server communication
   int fd_;
 
-  // True if the session is write blocked due to the socket returning EAGAIN.
-  // False if we have gotten a call to OnCanWrite after the last failed write.
-  bool write_blocked_;
-
   // The helper used for all connections.
   scoped_ptr<QuicEpollConnectionHelper> helper_;