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 14 matching lines @@
 template<>
 struct hash<net::QuicBlockedWriterInterface*> {
   std::size_t operator()(
       const net::QuicBlockedWriterInterface* ptr) const {
     return hash<size_t>()(reinterpret_cast<size_t>(ptr));
   }
 };
 }
 #endif
 
-namespace gfe2 {
-  class EpollServer;
-}
-
 namespace net {
 
+class EpollServer;
 class QuicConfig;
 class QuicCryptoServerConfig;
 class QuicSession;
 
 namespace tools {
 
 namespace test {
 class QuicDispatcherPeer;
 }  // namespace test
 
@@ skipping 86 matching lines @@
   // False if we have gotten a call to OnCanWrite after the last failed write.
   bool write_blocked_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicDispatcher);
 };
 
 }  // namespace tools
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_DISPATCHER_H_