Landing Recent QUIC changes until 01/28/2016 18:41 UTC

net/quic/quic_multipath_transmissions_map.h

Index: net/quic/quic_multipath_transmissions_map.h
diff --git a/net/quic/quic_multipath_transmissions_map.h b/net/quic/quic_multipath_transmissions_map.h
index 121e63ee6a510af43074b3ae37035fd0c824e416..25b899467b65e2736c8f24d2e11200f6a1868c25 100644
--- a/net/quic/quic_multipath_transmissions_map.h
+++ b/net/quic/quic_multipath_transmissions_map.h
@@ -13,20 +13,30 @@
 #define NET_QUIC_QUIC_MULTIPATH_TRANSMISSIONS_MAP_H_
 
 #include <deque>
+#include <unordered_map>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "net/quic/quic_protocol.h"
+#include "net/quic/quic_utils.h"
 
-namespace net_quic {
+namespace net {
 
 typedef std::pair<net::QuicPathId, net::QuicPacketNumber>
     QuicPathIdPacketNumber;
 
 class NET_EXPORT_PRIVATE QuicMultipathTransmissionsMap {
  public:
+  struct QuicPathIdPacketNumberHash {
+    size_t operator()(std::pair<QuicPathId, QuicPacketNumber> value) const {
+      return QuicUtils::PackPathIdAndPacketNumber(value.first, value.second);
+    }
+  };
+
   typedef std::deque<QuicPathIdPacketNumber> MultipathTransmissionsList;
-  typedef base::hash_map<QuicPathIdPacketNumber, MultipathTransmissionsList*>
+  typedef std::unordered_map<QuicPathIdPacketNumber,
+                             MultipathTransmissionsList*,
+                             QuicPathIdPacketNumberHash>
       MultipathTransmissionsMap;
 
   QuicMultipathTransmissionsMap();
@@ -60,6 +70,6 @@ class NET_EXPORT_PRIVATE QuicMultipathTransmissionsMap {
   MultipathTransmissionsMap transmission_map_;
 };
 
-}  // namespace net_quic
+}  // namespace net
 
 #endif  // NET_QUIC_QUIC_MULTIPATH_TRANSMISSIONS_MAP_H_