Landing Recent QUIC changes until 12/18/2015 13:57 UTC

net/quic/quic_connection.h

Index: net/quic/quic_connection.h
diff --git a/net/quic/quic_connection.h b/net/quic/quic_connection.h
index 76bfd347c79d58ccb1ec05c18c9bd35819de092b..6aee255d4592ba80ba994b9e8a10bf6635b707ac 100644
--- a/net/quic/quic_connection.h
+++ b/net/quic/quic_connection.h
@@ -696,10 +696,14 @@ class NET_EXPORT_PRIVATE QuicConnection
   bool WritePacketInner(QueuedPacket* packet);
 
   // Make sure an ack we got from our peer is sane.
-  bool ValidateAckFrame(const QuicAckFrame& incoming_ack);
+  // Returns nullptr for valid acks or an error std::string if it was invalid.
+  const char* ValidateAckFrame(const QuicAckFrame& incoming_ack);
 
   // Make sure a stop waiting we got from our peer is sane.
-  bool ValidateStopWaitingFrame(const QuicStopWaitingFrame& stop_waiting);
+  // Returns nullptr if the frame is valid or an error std::string if it was
+  // invalid.
+  const char* ValidateStopWaitingFrame(
+      const QuicStopWaitingFrame& stop_waiting);
 
   // Sends a version negotiation packet to the peer.
   void SendVersionNegotiationPacket();