Remove SpdyPingControlFrame struct. Useful for SPDY 4 development.

net/spdy/spdy_framer.cc

 // 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.
 
 // TODO(rtenhove) clean up frame buffer size calculations so that we aren't
 // constantly adding and subtracting header sizes; this is ugly and error-
 // prone.
 
 #include "net/spdy/spdy_framer.h"
 
@@ skipping 1165 matching lines @@
     size_t bytes_read = UpdateCurrentFrameBuffer(&data, &len,
                                                  remaining_control_payload_);
     remaining_control_payload_ -= bytes_read;
     remaining_data_ -= bytes_read;
     if (remaining_control_payload_ == 0) {
       SpdyControlFrame control_frame(current_frame_buffer_.get(), false);
       DCHECK(!control_frame.has_header_block());
       // Use frame-specific handlers.
       switch (control_frame.type()) {
         case PING: {
-            SpdyPingControlFrame* ping_frame =
-                reinterpret_cast<SpdyPingControlFrame*>(&control_frame);
-            visitor_->OnPing(ping_frame->unique_id());
+            SpdyFrameReader reader(current_frame_buffer_.get(),
+                                   current_frame_len_);
+            reader.Seek(GetControlFrameMinimumSize());  // Skip frame header.
+            SpdyPingId id = 0;
+            bool successful_read = reader.ReadUInt32(&id);
+            DCHECK(successful_read);
+            DCHECK(reader.IsDoneReading());
+            visitor_->OnPing(id);
           }
           break;
         case WINDOW_UPDATE: {
             SpdyFrameReader reader(current_frame_buffer_.get(),
                                    current_frame_len_);
             reader.Seek(SpdyFrame::kHeaderSize);  // Seek past frame header.
             SpdyStreamId stream_id = kInvalidStream;
             uint32 delta_window_size = 0;
             bool successful_read = reader.ReadUInt31(&stream_id);
             DCHECK(successful_read);
@@ skipping 368 matching lines @@
     }
     SettingsFlagsAndId flags_and_id(setting_flags, it->first);
     uint32 id_and_flags_wire = flags_and_id.GetWireFormat(protocol_version());
     builder.WriteBytes(&id_and_flags_wire, 4);
     builder.WriteUInt32(it->second.value);
   }
   DCHECK_EQ(size, builder.length());
   return builder.take();
 }
 
-SpdyPingControlFrame* SpdyFramer::CreatePingFrame(uint32 unique_id) const {
+SpdyFrame* SpdyFramer::CreatePingFrame(uint32 unique_id) const {
   SpdyPingIR ping(unique_id);
-  return reinterpret_cast<SpdyPingControlFrame*>(SerializePing(ping));
+  return SerializePing(ping);
 }
 
 SpdySerializedFrame* SpdyFramer::SerializePing(const SpdyPingIR& ping) const {
   SpdyFrameBuilder builder(PING, 0, protocol_version(), GetPingSize());
   builder.WriteUInt32(ping.id());
   DCHECK_EQ(GetPingSize(), builder.length());
   return builder.take();
 }
 
 SpdyFrame* SpdyFramer::CreateGoAway(
@@ skipping 476 matching lines @@
       builder->WriteString(it->first);
       builder->WriteString(it->second);
     } else {
       builder->WriteStringPiece32(it->first);
       builder->WriteStringPiece32(it->second);
     }
   }
 }
 
 }  // namespace net