Update from https://crrev.com/312600

net/spdy/spdy_headers_block_parser.h

 // Copyright 2014 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_SPDY_SPDY_HEADERS_BLOCK_PARSER_H_
 #define NET_SPDY_SPDY_HEADERS_BLOCK_PARSER_H_
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "net/base/net_export.h"
 #include "net/spdy/spdy_prefixed_buffer_reader.h"
 #include "net/spdy/spdy_protocol.h"
 
 namespace net {
 
 // A handler class for SPDY headers.
 class SpdyHeadersHandlerInterface {
  public:
   virtual ~SpdyHeadersHandlerInterface() {}
 
   // A callback method which notifies when the parser starts handling a new
   // SPDY headers block, this method also notifies on the number of headers in
   // the block.
-  virtual void OnHeaderBlock(SpdyStreamId stream_id,
-                             uint32_t num_of_headers) = 0;
+  virtual void OnHeaderBlock(uint32_t num_of_headers) = 0;
 
   // A callback method which notifies on a SPDY header key value pair.
-  virtual void OnHeader(SpdyStreamId stream_id,
-                        base::StringPiece key,
-                        base::StringPiece value) = 0;
+  virtual void OnHeader(base::StringPiece key, base::StringPiece value) = 0;
 
   // A callback method which notifies when the parser finishes handling a SPDY
   // headers block. Also notifies on the total number of bytes in this block.
-  virtual void OnHeaderBlockEnd(SpdyStreamId stream_id,
-                                size_t header_bytes_parsed) = 0;
+  virtual void OnHeaderBlockEnd(size_t header_bytes_parsed) = 0;
 };
 
 namespace test {
 
 class SpdyHeadersBlockParserPeer;
 
 }  // namespace test
 
 // This class handles SPDY headers block bytes and parses out key-value pairs
 // as they arrive. This class is not thread-safe, and assumes that all headers
@@ skipping 21 matching lines @@
     OK,
     // Set when parsing failed due to insufficient data.
     // This error is recoverable, by passing in new data.
     NEED_MORE_DATA,
     // Set when a complete block has been read, but unprocessed data remains.
     TOO_MUCH_DATA,
     // Set when a block exceeds |MaxNumberOfHeadersForVersion| headers.
     HEADER_BLOCK_TOO_LARGE,
     // Set when a header key or value exceeds |kMaximumFieldLength|.
     HEADER_FIELD_TOO_LARGE,
+    // Set when the parser is given an unexpected stream ID.
+    UNEXPECTED_STREAM_ID,
   };
   ParserError get_error() const { return error_; }
 
   SpdyMajorVersion spdy_version() const { return spdy_version_; }
 
   // Returns the size in bytes of a length field in a SPDY header.
   static size_t LengthFieldSizeForVersion(SpdyMajorVersion spdy_version);
 
   // Returns the maximal number of headers in a SPDY headers block.
   static size_t MaxNumberOfHeadersForVersion(SpdyMajorVersion spdy_version);
@@ skipping 52 matching lines @@
   SpdyStreamId stream_id_;
 
   ParserError error_;
 
   const SpdyMajorVersion spdy_version_;
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_HEADERS_BLOCK_PARSER_H_