Update from https://crrev.com/312398

net/quic/quic_headers_stream.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_QUIC_HEADERS_STREAM_H_
 #define NET_QUIC_QUIC_HEADERS_STREAM_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_export.h"
@@ skipping 13 matching lines @@
   ~QuicHeadersStream() override;
 
   // Writes |headers| for |stream_id| in a SYN_STREAM or SYN_REPLY
   // frame to the peer.  If |fin| is true, the fin flag will be set on
   // the SPDY frame.  Returns the size, in bytes, of the resulting
   // SPDY frame.
   size_t WriteHeaders(
       QuicStreamId stream_id,
       const SpdyHeaderBlock& headers,
       bool fin,
+      QuicPriority priority,
       QuicAckNotifier::DelegateInterface* ack_notifier_delegate);
 
   // ReliableQuicStream implementation
   uint32 ProcessRawData(const char* data, uint32 data_len) override;
   QuicPriority EffectivePriority() const override;
 
+  void OnSuccessfulVersionNegotiation(QuicVersion version);
+
  private:
   class SpdyFramerVisitor;
 
+  void InitializeFramer(QuicVersion version);
+
   // The following methods are called by the SimpleVisitor.
 
   // Called when a SYN_STREAM frame has been received.
   void OnSynStream(SpdyStreamId stream_id,
                    SpdyPriority priority,
                    bool fin);
 
   // Called when a SYN_REPLY frame been received.
   void OnSynReply(SpdyStreamId stream_id, bool fin);
 
@@ skipping 11 matching lines @@
   void OnCompressedFrameSize(size_t frame_len);
 
   // Returns true if the session is still connected.
   bool IsConnected();
 
   // Data about the stream whose headers are being processed.
   QuicStreamId stream_id_;
   bool fin_;
   size_t frame_len_;
 
-  SpdyFramer spdy_framer_;
+  scoped_ptr<SpdyFramer> spdy_framer_;
   scoped_ptr<SpdyFramerVisitor> spdy_framer_visitor_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicHeadersStream);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_HEADERS_STREAM_H_