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

net/quic/quic_multipath_transmissions_map_test.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"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace net_quic {
+namespace net {
 namespace test {
 namespace {
 
 TEST(QuicAcrossPathsTransmissionMapTest, OnPacketRetransmittedOnDifferentPath) {
   QuicMultipathTransmissionsMap transmission_map;
   // Packet0's original transmission sent on path 1 with packet number 1.
   QuicPathIdPacketNumber packet0_0(1, 1);
   // Packet0's retransmission sent on path 2 with packet number 1.
   QuicPathIdPacketNumber packet0_1(2, 1);
   // packet0's 2nd retransmission sent on path 3 with packet number 1.
@@ skipping 85 matching lines @@
   transmission_map.OnPacketHandled(packet1_1);
   EXPECT_EQ(nullptr,
             transmission_map.MaybeGetTransmissionsOnOtherPaths(packet1_0));
   EXPECT_EQ(nullptr,
             transmission_map.MaybeGetTransmissionsOnOtherPaths(packet1_1));
   // Make sure there is no memory leakage.
 }
 
 }  // namespace
 }  // namespace test
-}  // namespace net_quic
+}  // namespace net