Landing Recent QUIC changes until Sat Aug 13 04:32:36 2016 UTC-0

net/quic/core/quic_config_test.cc

Index: net/quic/core/quic_config_test.cc
diff --git a/net/quic/core/quic_config_test.cc b/net/quic/core/quic_config_test.cc
index adac1600b80f2ce2675945bb01a1b35171f340e7..d89ade55be503d1f5a2fce54a9b588a9bfc34e9a 100644
--- a/net/quic/core/quic_config_test.cc
+++ b/net/quic/core/quic_config_test.cc
@@ -219,8 +219,9 @@ TEST_F(QuicConfigTest, InvalidFlowControlWindow) {
   // peer: the receive window must be at least the default of 16 Kb.
   QuicConfig config;
   const uint64_t kInvalidWindow = kMinimumFlowControlSendWindow - 1;
-  EXPECT_DFATAL(config.SetInitialStreamFlowControlWindowToSend(kInvalidWindow),
-                "Initial stream flow control receive window");
+  EXPECT_QUIC_BUG(
+      config.SetInitialStreamFlowControlWindowToSend(kInvalidWindow),
+      "Initial stream flow control receive window");
 
   EXPECT_EQ(kMinimumFlowControlSendWindow,
             config.GetInitialStreamFlowControlWindowToSend());