Land Recent QUIC Changes.

net/tools/quic/quic_dispatcher.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A server side dispatcher which dispatches a given client's data to their
 // stream.
 
 #ifndef NET_TOOLS_QUIC_QUIC_DISPATCHER_H_
 #define NET_TOOLS_QUIC_QUIC_DISPATCHER_H_
 
@@ skipping 79 matching lines @@
 
   // Sends ConnectionClose frames to all connected clients.
   void Shutdown();
 
   // QuicServerSessionVisitor interface implementation:
   // Ensure that the closed connection is cleaned up asynchronously.
   virtual void OnConnectionClosed(QuicConnectionId connection_id,
                                   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;
 
   // Deletes all sessions on the closed session list and clears the list.
   void DeleteSessions();
 
   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.
   virtual QuicPacketWriter* CreateWriter(int fd);
 
   virtual QuicSession* CreateQuicSession(QuicConnectionId connection_id,
                                          const IPEndPoint& server_address,
                                          const IPEndPoint& client_address);
 
   virtual QuicConnection* CreateQuicConnection(
@@ skipping 111 matching lines @@
   QuicFramer framer_;
   scoped_ptr<QuicFramerVisitor> framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_DISPATCHER_H_