Land Recent QUIC Changes.

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 5e15ade77fe093da999a7ee666d806ba81f18900..e7a5e950133917d183a5132acee991adf2b5241f 100644
--- a/net/quic/quic_dispatcher.h
+++ b/net/quic/quic_dispatcher.h
@@ -95,7 +95,8 @@ class QuicDispatcher : public QuicBlockedWriterInterface,
                                   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;
 
@@ -104,8 +105,6 @@ class QuicDispatcher : public QuicBlockedWriterInterface,
 
   const SessionMap& session_map() const { return session_map_; }
 
-  WriteBlockedList* write_blocked_list() { return &write_blocked_list_; }
-
  protected:
   virtual QuicSession* CreateQuicSession(QuicConnectionId connection_id,
                                          const IPEndPoint& server_address,