Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/quic_spdy_session.cc

Index: net/quic/core/quic_spdy_session.cc
diff --git a/net/quic/core/quic_spdy_session.cc b/net/quic/core/quic_spdy_session.cc
index 61d16c9020abdb0d62d865fd57960e25884634c9..77cd2cbb6800c798691ee80d1992ac3ac0f8fc89 100644
--- a/net/quic/core/quic_spdy_session.cc
+++ b/net/quic/core/quic_spdy_session.cc
@@ -9,9 +9,9 @@
 #include <string>
 #include <utility>
 
-#include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_headers_stream.h"
 #include "net/quic/platform/api/quic_bug_tracker.h"
+#include "net/quic/platform/api/quic_flags.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_str_cat.h"
 
@@ -609,10 +609,8 @@ void QuicSpdySession::OnConfigNegotiated() {
         kStreamReceiveWindowLimit);
   }
 
-  if (version > QUIC_VERSION_34) {
-    server_push_enabled_ =
-        FLAGS_quic_reloadable_flag_quic_enable_server_push_by_default;
-  }
+  server_push_enabled_ =
+      FLAGS_quic_reloadable_flag_quic_enable_server_push_by_default;
 }
 
 void QuicSpdySession::OnStreamFrameData(QuicStreamId stream_id,