Land recent SPDY changes

net/spdy/spdy_frame_builder.h

 // Copyright (c) 2012 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_FRAME_BUILDER_H_
 #define NET_SPDY_SPDY_FRAME_BUILDER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 41 matching lines @@
   // capacity_. The given type must be a control frame type.
   // Used only for SPDY versions <4.
   bool WriteControlFrameHeader(const SpdyFramer& framer,
                                SpdyFrameType type,
                                uint8 flags);
 
   // Populates this frame with a SPDY data frame header using version-specific
   // information from the |framer| and length information from capacity_.
   bool WriteDataFrameHeader(const SpdyFramer& framer,
                             SpdyStreamId stream_id,
-                            SpdyDataFlags flags);
+                            uint8 flags);
 
   // Populates this frame with a SPDY4/HTTP2 frame prefix using
   // version-specific information from the |framer| and length information from
   // capacity_. The given type must be a control frame type.
   // Used only for SPDY versions >=4.
   bool WriteFramePrefix(const SpdyFramer& framer,
                         SpdyFrameType type,
                         uint8 flags,
                         SpdyStreamId stream_id);
 
@@ skipping 37 matching lines @@
   // with the correct version for the frame being written.
   bool RewriteLength(const SpdyFramer& framer);
 
   // Update (in-place) the length field in the frame being built to reflect the
   // given length.
   // The framer parameter is used to determine version-specific location and
   // size information of the length field to be written, and must be initialized
   // with the correct version for the frame being written.
   bool OverwriteLength(const SpdyFramer& framer, size_t length);
 
+  // Update (in-place) the flags field in the frame being built to reflect the
+  // given flags value.
+  // Used only for SPDY versions >=4.
+  bool OverwriteFlags(const SpdyFramer& framer, uint8 flags);
+
  private:
   // Checks to make sure that there is an appropriate amount of space for a
   // write of given size, in bytes.
   bool CanWrite(size_t length) const;
 
   scoped_ptr<char[]> buffer_;
   size_t capacity_;  // Allocation size of payload, set by constructor.
   size_t length_;    // Current length of the buffer.
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_FRAME_BUILDER_H_