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 d60ba69883d9f553957d622ded2ccae931aa789e..9553583f7320d60acad25b1127c08c9ee11b0ac9 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -50,7 +50,16 @@ class QuicDispatcherPeer;
 class DeleteSessionsAlarm;
 class QuicEpollConnectionHelper;
 
-class QuicDispatcher : public QuicServerSessionVisitor {
+class ProcessPacketInterface {
+ public:
+  virtual ~ProcessPacketInterface() {}
+  virtual void ProcessPacket(const IPEndPoint& server_address,
+                             const IPEndPoint& client_address,
+                             const QuicEncryptedPacket& packet) = 0;
+};
+
+class QuicDispatcher : public QuicServerSessionVisitor,
+                       public ProcessPacketInterface {
  public:
   // Ideally we'd have a linked_hash_set: the  boolean is unused.
   typedef linked_hash_map<QuicBlockedWriterInterface*, bool> WriteBlockedList;
@@ -71,7 +80,7 @@ class QuicDispatcher : public QuicServerSessionVisitor {
   // an existing session, or passing it to the TimeWaitListManager.
   virtual void ProcessPacket(const IPEndPoint& server_address,
                              const IPEndPoint& client_address,
-                             const QuicEncryptedPacket& packet);
+                             const QuicEncryptedPacket& packet) OVERRIDE;
 
   // Called when the socket becomes writable to allow queued writes to happen.
   virtual void OnCanWrite();
@@ -136,10 +145,6 @@ class QuicDispatcher : public QuicServerSessionVisitor {
     return supported_versions_;
   }
 
-  const QuicVersionVector& supported_versions_no_flow_control() const {
-    return supported_versions_no_flow_control_;
-  }
-
   const QuicVersionVector& supported_versions_no_connection_flow_control()
       const {
     return supported_versions_no_connection_flow_control_;
@@ -211,12 +216,6 @@ class QuicDispatcher : public QuicServerSessionVisitor {
   // skipped as necessary).
   const QuicVersionVector supported_versions_;
 
-  // Versions which do not support flow control (introduced in QUIC_VERSION_17).
-  // This is used to construct new QuicConnections when flow control is disabled
-  // via flag.
-  // TODO(rjshade): Remove this when
-  // FLAGS_enable_quic_stream_flow_control_2 is removed.
-  QuicVersionVector supported_versions_no_flow_control_;
   // Versions which do not support *connection* flow control (introduced in
   // QUIC_VERSION_19).
   // This is used to construct new QuicConnections when connection flow control