flip_in_mem_edsm_server builds again.

net/tools/flip_server/epoll_server.h

Index: net/tools/flip_server/epoll_server.h
diff --git a/net/tools/flip_server/epoll_server.h b/net/tools/flip_server/epoll_server.h
index bbcb18849ec835209d169dcba3bc8e816b33729b..abadaff7ea0a15379bbc21a74a99e1d1f66fad6a 100644
--- a/net/tools/flip_server/epoll_server.h
+++ b/net/tools/flip_server/epoll_server.h
@@ -8,8 +8,6 @@
 
 #include <fcntl.h>
 #include <sys/queue.h>
-#include <ext/hash_map>  // it is annoying that gcc does this. oh well.
-#include <ext/hash_set>
 #include <map>
 #include <string>
 #include <utility>
@@ -36,6 +34,7 @@
 #endif
 
 #include "base/basictypes.h"
+#include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include <sys/epoll.h>
 
@@ -574,7 +573,7 @@ class EpollServer {
     }
   };
 
-  typedef __gnu_cxx::hash_set<CBAndEventMask, CBAndEventMaskHash> FDToCBMap;
+  typedef base::hash_set<CBAndEventMask, CBAndEventMaskHash> FDToCBMap;
 
   // the following four functions are OS-specific, and are likely
   // to be changed in a subclass if the poll/select method is changed
@@ -943,7 +942,7 @@ class EpollServer {
 
     std::vector<DebugOutput*> debug_events_;
     std::vector<Events> unregistered_fds_;
-    typedef __gnu_cxx::hash_map<int, Events> EventCountsMap;
+    typedef base::hash_map<int, Events> EventCountsMap;
     EventCountsMap event_counts_;
     int64 num_records_;
     int64 record_threshold_;