Getting rid of SpdyFramer::GetControlFrameStreamId(), which cleans up the code and also makes it ea…

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 e7cd38e8434370963178192b955afebb4e4c6652..9cef56c56ebfa9e67bd54a74d5ff9c583ee68763 100644
--- a/net/spdy/spdy_framer.h
+++ b/net/spdy/spdy_framer.h
@@ -475,12 +475,6 @@ class NET_EXPORT_PRIVATE SpdyFramer {
   // Returns true if a frame could be compressed.
   bool IsCompressible(const SpdyFrame& frame) const;
 
-  // Get the stream ID for the given control frame (SYN_STREAM, SYN_REPLY, and
-  // HEADERS). If the control frame is NULL or of another type, this
-  // function returns kInvalidStream.
-  static SpdyStreamId GetControlFrameStreamId(
-      const SpdyControlFrame* control_frame);
-
   // For ease of testing and experimentation we can tweak compression on/off.
   void set_enable_compression(bool value) {
     enable_compression_ = value;
@@ -567,14 +561,14 @@ class NET_EXPORT_PRIVATE SpdyFramer {
   // in decompressed form, in chunks. Returns true if the visitor has
   // accepted all of the chunks.
   bool IncrementallyDecompressControlFrameHeaderData(
-      const SpdyControlFrame* frame,
+      SpdyStreamId stream_id,
       const char* data,
       size_t len);
 
   // Deliver the given control frame's uncompressed headers block to the
   // visitor in chunks. Returns true if the visitor has accepted all of the
   // chunks.
-  bool IncrementallyDeliverControlFrameHeaderData(const SpdyControlFrame* frame,
+  bool IncrementallyDeliverControlFrameHeaderData(SpdyStreamId stream_id,
                                                   const char* data,
                                                   size_t len);