Land recent SPDY changes (through 70021377)

net/spdy/spdy_framer.h

Index: net/spdy/spdy_framer.h
diff --git a/net/spdy/spdy_framer.h b/net/spdy/spdy_framer.h
index 218423424fba612648742a4721f3d892e8ecaf40..a2ff3ab31211efe6225732ed280ef2f29d6941ed 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -284,6 +284,12 @@ class NET_EXPORT_PRIVATE SpdyFramerVisitorInterface {
                         base::StringPiece protocol_id,
                         base::StringPiece host,
                         base::StringPiece origin) {}
+
+  // Called when a PRIORITY frame is received.
+  virtual void OnPriority(SpdyStreamId stream_id,
+                          SpdyStreamId parent_stream_id,
+                          uint8 weight,
+                          bool exclusive) {};
 };
 
 // Optionally, and in addition to SpdyFramerVisitorInterface, a class supporting
@@ -478,6 +484,10 @@ class NET_EXPORT_PRIVATE SpdyFramer {
   // availability of an alternative service to the client.
   SpdySerializedFrame* SerializeAltSvc(const SpdyAltSvcIR& altsvc);
 
+  // Serializes a PRIORITY frame. The PRIORITY frame advises a change in
+  // the relative priority of the given stream.
+  SpdySerializedFrame* SerializePriority(const SpdyPriorityIR& priority);
+
   // Serialize a frame of unknown type.
   SpdySerializedFrame* SerializeFrame(const SpdyFrameIR& frame);
 
@@ -726,9 +736,6 @@ class NET_EXPORT_PRIVATE SpdyFramer {
   // The length (in bytes) of the padding payload to be processed.
   size_t remaining_padding_payload_length_;
 
-  // The length (in bytes) of the padding length field to be processed.
-  size_t remaining_padding_length_fields_;
-
   // The number of bytes remaining to read from the current control frame's
   // headers. Note that header data blocks (for control types that have them)
   // are part of the frame's payload, and not the frame's headers.