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 504b27d3373c1d2a04168d2f5d17a37cace15aa3..1fe9af2aaab0a7f3ee75e3aa1815f888a72fb62d 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -126,7 +126,6 @@ class QuicDispatcher : public QuicServerSessionVisitor {
     return time_wait_list_manager_.get();
   }
 
-  QuicEpollConnectionHelper* helper() { return helper_.get(); }
   EpollServer* epoll_server() { return epoll_server_; }
 
   const QuicVersionVector& supported_versions() const {
@@ -137,10 +136,6 @@ class QuicDispatcher : public QuicServerSessionVisitor {
   virtual bool OnUnauthenticatedPublicHeader(
       const QuicPacketPublicHeader& header);
 
-  // Information about the packet currently being dispatched.
-  const IPEndPoint& current_client_address() {
-    return current_client_address_;
-  }
   const IPEndPoint& current_server_address() {
     return current_server_address_;
   }