Landing Recent QUIC changes until 9:58 AM, Sep 17, 2016 UTC

net/quic/core/quic_spdy_session.h

Index: net/quic/core/quic_spdy_session.h
diff --git a/net/quic/core/quic_spdy_session.h b/net/quic/core/quic_spdy_session.h
index 0f92a20ce619b1934ceafe0997cc66f428f1e211..82f96f2f9be1d4b2e81e8fe444cd5ff7ec22a9f4 100644
--- a/net/quic/core/quic_spdy_session.h
+++ b/net/quic/core/quic_spdy_session.h
@@ -109,6 +109,12 @@ class NET_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
 
   bool force_hol_blocking() const { return force_hol_blocking_; }
 
+  bool server_push_enabled() const { return server_push_enabled_; }
+
+  // Called by |QuicHeadersStream::UpdateEnableServerPush()| with
+  // value from SETTINGS_ENABLE_PUSH.
+  void set_server_push_enabled(bool enable) { server_push_enabled_ = enable; }
+
  protected:
   // Override CreateIncomingDynamicStream() and CreateOutgoingDynamicStream()
   // with QuicSpdyStream return type to make sure that all data streams are
@@ -135,6 +141,10 @@ class NET_EXPORT_PRIVATE QuicSpdySession : public QuicSession {
   // HTTP/2 over TCP.
   bool force_hol_blocking_;
 
+  // Set during handshake. If true, resources in x-associated-content and link
+  // headers will be pushed.
+  bool server_push_enabled_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicSpdySession);
 };