SPDY - integration of spdy/3 code.

net/spdy/buffered_spdy_framer.cc

Index: net/spdy/buffered_spdy_framer.cc
===================================================================
--- net/spdy/buffered_spdy_framer.cc	(revision 126086)
+++ net/spdy/buffered_spdy_framer.cc	(working copy)
@@ -9,7 +9,7 @@
 namespace spdy {
 
 BufferedSpdyFramer::BufferedSpdyFramer(int version)
-    : spdy_framer_(),
+    : spdy_framer_(version),
       visitor_(NULL),
       header_buffer_used_(0),
       header_buffer_valid_(false),
@@ -49,8 +49,6 @@
           *reinterpret_cast<const spdy::SpdyPingControlFrame*>(frame));
       break;
     case SETTINGS:
-      visitor_->OnSettings(
-          *reinterpret_cast<const spdy::SpdySettingsControlFrame*>(frame));
       break;
     case RST_STREAM:
       visitor_->OnRstStream(
@@ -136,6 +134,12 @@
   visitor_->OnStreamFrameData(stream_id, data, len);
 }
 
+void BufferedSpdyFramer::OnSetting(SpdySettingsIds id,
+                                   uint8 flags,
+                                   uint32 value) {
+  visitor_->OnSetting(id, flags, value);
+}
+
 int BufferedSpdyFramer::protocol_version() {
   return spdy_framer_.protocol_version();
 }
@@ -164,11 +168,6 @@
   return spdy_framer_.HasError();
 }
 
-bool BufferedSpdyFramer::ParseHeaderBlock(const SpdyFrame* frame,
-                                          SpdyHeaderBlock* block) {
-  return spdy_framer_.ParseHeaderBlock(frame, block);
-}
-
 SpdySynStreamControlFrame* BufferedSpdyFramer::CreateSynStream(
     SpdyStreamId stream_id,
     SpdyStreamId associated_stream_id,
@@ -235,6 +234,10 @@
   return spdy_framer_.CreateDataFrame(stream_id, data, len, flags);
 }
 
+SpdyPriority BufferedSpdyFramer::GetHighestPriority() const {
+  return spdy_framer_.GetHighestPriority();
+}
+
 SpdyFrame* BufferedSpdyFramer::CompressFrame(const SpdyFrame& frame) {
   return spdy_framer_.CompressFrame(frame);
 }