Landing Recent QUIC changes until Jun 27 19:50:48 2017 +0000

net/quic/core/quic_session_test.cc

Index: net/quic/core/quic_session_test.cc
diff --git a/net/quic/core/quic_session_test.cc b/net/quic/core/quic_session_test.cc
index 8877be83158c32b399ec89184ebe847b68d4b791..9d0b86fff7434e654f8b691f87b33c92777f04b6 100644
--- a/net/quic/core/quic_session_test.cc
+++ b/net/quic/core/quic_session_test.cc
@@ -1256,7 +1256,7 @@ TEST_P(QuicSessionTestServer, TestMaxIncomingAndOutgoingStreamsAllowed) {
 TEST_P(QuicSessionTestServer, EnableFHOLThroughConfigOption) {
   QuicConfigPeer::SetReceivedForceHolBlocking(session_.config());
   session_.OnConfigNegotiated();
-  if (version() != QUIC_VERSION_36) {
+  if (version() != QUIC_VERSION_36 || session_.use_stream_notifier()) {
     EXPECT_FALSE(session_.force_hol_blocking());
   } else {
     EXPECT_TRUE(session_.force_hol_blocking());
@@ -1341,7 +1341,7 @@ TEST_P(QuicSessionTestClient, EnableDHDTThroughConnectionOption) {
 TEST_P(QuicSessionTestClient, EnableFHOLThroughConfigOption) {
   session_.config()->SetForceHolBlocking();
   session_.OnConfigNegotiated();
-  if (version() != QUIC_VERSION_36) {
+  if (version() != QUIC_VERSION_36 || session_.use_stream_notifier()) {
     EXPECT_FALSE(session_.force_hol_blocking());
   } else {
     EXPECT_TRUE(session_.force_hol_blocking());