Refactor QuicConnection to use explicit notification for getting onto

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 47c31d213e7718c5381a8e2641a774c2bdffafdd..cc72618852154918aa88261515b581b84c421833 100644
--- a/net/tools/quic/quic_dispatcher.h
+++ b/net/tools/quic/quic_dispatcher.h
@@ -16,7 +16,6 @@
 #include "net/base/ip_endpoint.h"
 #include "net/base/linked_hash_map.h"
 #include "net/quic/quic_blocked_writer_interface.h"
-#include "net/quic/quic_packet_writer.h"
 #include "net/quic/quic_protocol.h"
 #include "net/tools/epoll_server/epoll_server.h"
 #include "net/tools/quic/quic_server_session.h"
@@ -53,8 +52,7 @@ class QuicDispatcherPeer;
 class DeleteSessionsAlarm;
 class QuicEpollConnectionHelper;
 
-class QuicDispatcher : public QuicPacketWriter,
-                       public QuicServerSessionVisitor {
+class QuicDispatcher : public QuicServerSessionVisitor {
  public:
   // Ideally we'd have a linked_hash_set: the  boolean is unused.
   typedef linked_hash_map<QuicBlockedWriterInterface*, bool> WriteBlockedList;
@@ -71,16 +69,6 @@ class QuicDispatcher : public QuicPacketWriter,
 
   void Initialize(int fd);
 
-  // QuicPacketWriter
-  virtual WriteResult WritePacket(
-      const char* buffer, size_t buf_len,
-      const IPAddressNumber& self_address,
-      const IPEndPoint& peer_address,
-      QuicBlockedWriterInterface* writer) OVERRIDE;
-  virtual bool IsWriteBlockedDataBuffered() const OVERRIDE;
-  virtual bool IsWriteBlocked() const OVERRIDE;
-  virtual void SetWritable() OVERRIDE;
-
   // Process the incoming packet by creating a new session, passing it to
   // an existing session, or passing it to the TimeWaitListManager.
   virtual void ProcessPacket(const IPEndPoint& server_address,
@@ -105,11 +93,6 @@ class QuicDispatcher : public QuicPacketWriter,
 
   typedef base::hash_map<QuicGuid, QuicSession*> SessionMap;
 
-  virtual QuicSession* CreateQuicSession(
-      QuicGuid guid,
-      const IPEndPoint& server_address,
-      const IPEndPoint& client_address);
-
   // Deletes all sessions on the closed session list and clears the list.
   void DeleteSessions();
 
@@ -127,6 +110,14 @@ class QuicDispatcher : public QuicPacketWriter,
   virtual QuicPacketWriterWrapper* CreateWriterWrapper(
       QuicPacketWriter* writer);
 
+  virtual QuicSession* CreateQuicSession(QuicGuid guid,
+                                         const IPEndPoint& server_address,
+                                         const IPEndPoint& client_address);
+
+  QuicConnection* CreateQuicConnection(QuicGuid guid,
+                                       const IPEndPoint& server_address,
+                                       const IPEndPoint& client_address);
+
   // Replaces the packet writer with |writer|. Takes ownership of |writer|.
   void set_writer(QuicPacketWriter* writer);