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

net/quic/quic_multipath_transmissions_map_test.cc

Index: net/quic/quic_multipath_transmissions_map_test.cc
diff --git a/net/quic/quic_multipath_transmissions_map_test.cc b/net/quic/quic_multipath_transmissions_map_test.cc
index fcae200772c4cbf4109e1415817db84cde48c455..ec31910ba75a2e0428f9d539ebf6cddecf631313 100644
--- a/net/quic/quic_multipath_transmissions_map_test.cc
+++ b/net/quic/quic_multipath_transmissions_map_test.cc
@@ -5,7 +5,7 @@
 #include "net/quic/quic_multipath_transmissions_map.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace net_quic {
+namespace net {
 namespace test {
 namespace {
 
@@ -111,4 +111,4 @@ TEST(QuicAcrossPathsTransmissionMapTest, OnPacketHandled) {
 
 }  // namespace
 }  // namespace test
-}  // namespace net_quic
+}  // namespace net