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

net/quic/quic_multipath_transmissions_map.cc

 // Copyright (c) 2015 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.
 
 #include "net/quic/quic_multipath_transmissions_map.h"
 
-namespace net_quic {
+namespace net {
 
 QuicMultipathTransmissionsMap::QuicMultipathTransmissionsMap() {}
 
 QuicMultipathTransmissionsMap::~QuicMultipathTransmissionsMap() {
   for (std::pair<QuicPathIdPacketNumber, MultipathTransmissionsList*>
            packet_transmissions : transmission_map_) {
     packet_transmissions.second->pop_front();
     if (packet_transmissions.second->empty()) {
       delete packet_transmissions.second;
     }
@@ skipping 42 matching lines @@
   MultipathTransmissionsList* transmission_list = it->second;
   MultipathTransmissionsList::iterator transmission_it;
   // Remove all across paths transmissions of this packet from the map.
   for (QuicPathIdPacketNumber path_id_packet_number : *transmission_list) {
     transmission_map_.erase(path_id_packet_number);
   }
   // Remove the multipath transmissions list.
   delete transmission_list;
 }
 
-}  // namespace net_quic
+}  // namespace net