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 9553583f7320d60acad25b1127c08c9ee11b0ac9..088de311af3a27fe490cc60c7e551e970a6789df 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -97,7 +97,8 @@ class QuicDispatcher : public QuicServerSessionVisitor,
                                   QuicErrorCode error) OVERRIDE;
 
   // Queues the blocked writer for later resumption.
-  virtual void OnWriteBlocked(QuicBlockedWriterInterface* writer) OVERRIDE;
+  virtual void OnWriteBlocked(
+      QuicBlockedWriterInterface* blocked_writer) OVERRIDE;
 
   typedef base::hash_map<QuicConnectionId, QuicSession*> SessionMap;
 
@@ -106,8 +107,6 @@ class QuicDispatcher : public QuicServerSessionVisitor,
 
   const SessionMap& session_map() const { return session_map_; }
 
-  WriteBlockedList* write_blocked_list() { return &write_blocked_list_; }
-
  protected:
   // Instantiates a new low-level packet writer. Caller takes ownership of the
   // returned object.