Land Recent QUIC Changes.

net/tools/quic/quic_server.h

Index: net/tools/quic/quic_server.h
diff --git a/net/tools/quic/quic_server.h b/net/tools/quic/quic_server.h
index 119fa78ee4e01352ad0f886843adab9759d9e9aa..6285fd769d953417076055dcdf0d1e35247cf71b 100644
--- a/net/tools/quic/quic_server.h
+++ b/net/tools/quic/quic_server.h
@@ -31,8 +31,7 @@ class QuicServer : public EpollCallbackInterface {
  public:
   QuicServer();
   QuicServer(const QuicConfig& config,
-             const QuicVersionVector& supported_versions,
-             uint32 server_initial_flow_control_receive_window);
+             const QuicVersionVector& supported_versions);
 
   virtual ~QuicServer();
 
@@ -81,6 +80,18 @@ class QuicServer : public EpollCallbackInterface {
 
   int port() { return port_; }
 
+ protected:
+  virtual QuicDispatcher* CreateQuicDispatcher();
+
+  const QuicConfig& config() const { return config_; }
+  const QuicCryptoServerConfig& crypto_config() const {
+    return crypto_config_;
+  }
+  const QuicVersionVector& supported_versions() const {
+    return supported_versions_;
+  }
+  EpollServer* epoll_server() { return &epoll_server_; }
+
  private:
   friend class net::tools::test::QuicServerPeer;