Reland 'Convert //net and //chromecast to std::unordered_*'

net/tools/epoll_server/epoll_server.h

 // Copyright 2013 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.
 
 #ifndef NET_TOOLS_EPOLL_SERVER_EPOLL_SERVER_H_
 #define NET_TOOLS_EPOLL_SERVER_EPOLL_SERVER_H_
 
 #include <fcntl.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/queue.h>
 
 #include <map>
 #include <string>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 // #define EPOLL_SERVER_EVENT_TRACING 1
 //
 // Defining EPOLL_SERVER_EVENT_TRACING
 // causes code to exist which didn't before.
 // This code tracks each event generated by the epollserver,
 // as well as providing a per-fd-registered summary of
 // events. Note that enabling this code vastly slows
 // down operations, and uses substantially more
 // memory. For these reasons, it should only be enabled by developers doing
 // development at their workstations.
 //
 // A structure called 'EventRecorder' will exist when
 // the macro is defined. See the EventRecorder class interface
 // within the EpollServer class for more details.
 #ifdef EPOLL_SERVER_EVENT_TRACING
 #include <ostream>
 #include "base/logging.h"
 #endif
 
 #include "base/compiler_specific.h"
-#include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include <sys/epoll.h>
 
 namespace net {
 
 class EpollServer;
 class EpollAlarmCallbackInterface;
 class ReadPipeCallback;
 
@@ skipping 498 matching lines @@
     mutable bool in_use;
   };
 
   // Custom hash function to be used by hash_set.
   struct CBAndEventMaskHash {
     size_t operator()(const CBAndEventMask& cb_and_eventmask) const {
       return static_cast<size_t>(cb_and_eventmask.fd);
     }
   };
 
-  typedef base::hash_set<CBAndEventMask, CBAndEventMaskHash> FDToCBMap;
+  using FDToCBMap = std::unordered_set<CBAndEventMask, CBAndEventMaskHash>;
 
   // the following four functions are OS-specific, and are likely
   // to be changed in a subclass if the poll/select method is changed
   // from epoll.
 
   // Summary:
   //   Deletes a file-descriptor from the set of FDs that should be
   //   monitored with epoll.
   //   Note that this only deals with modifying data relating -directly-
   //   with the epoll call-- it does not modify any data within the
@@ skipping 90 matching lines @@
     size_t operator()(AlarmCB*const& p) const {
       return reinterpret_cast<size_t>(p);
     }
   };
 
 
   // TOOD(sushantj): Having this hash_set is avoidable. We currently have it
   // only so that we can enforce stringent checks that a caller can not register
   // the same alarm twice. One option is to have an implementation in which
   // this hash_set is used only in the debug mode.
-  typedef base::hash_set<AlarmCB*, AlarmCBHash> AlarmCBMap;
+  using AlarmCBMap = std::unordered_set<AlarmCB*, AlarmCBHash>;
   AlarmCBMap all_alarms_;
 
   TimeToAlarmCBMap alarm_map_;
 
   // The amount of time in microseconds that we'll wait before returning
   // from the WaitForEventsAndExecuteCallbacks() function.
   // If this is positive, wait that many microseconds.
   // If this is negative, wait forever, or for the first event that occurs
   // If this is zero, never wait for an event.
   int64_t timeout_in_us_;
@@ skipping 230 matching lines @@
       unsigned int epoll_wrband;
       unsigned int epoll_msg;
       unsigned int epoll_err;
       unsigned int epoll_hup;
       unsigned int epoll_oneshot;
       unsigned int epoll_et;
     };
 
     std::vector<DebugOutput*> debug_events_;
     std::vector<Events> unregistered_fds_;
-    typedef base::hash_map<int, Events> EventCountsMap;
+    using EventCountsMap = std::unordered_map<int, Events>;
     EventCountsMap event_counts_;
     int64_t num_records_;
     int64_t record_threshold_;
   };
 
   void ClearEventRecords() {
     event_recorder_.Clear();
   }
   void WriteEventRecords(ostream* os) const {
     (*os) << event_recorder_;
@@ skipping 105 matching lines @@
 
  private:
   EpollServer::AlarmRegToken token_;
   EpollServer* eps_;
   bool registered_;
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_EPOLL_SERVER_EPOLL_SERVER_H_