Landing Recent QUIC changes until 5/14/2016 02:25:25 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 b252978769dfe9f282aa888951640b4ff200050d..75385388a222c352c513f06fda23e88a9ac3d065 100644
--- a/net/quic/quic_connection.h
+++ b/net/quic/quic_connection.h
@@ -675,6 +675,10 @@ class NET_EXPORT_PRIVATE QuicConnection
 
   EncryptionLevel encryption_level() const { return encryption_level_; }
 
+  const IPEndPoint& last_packet_source_address() const {
+    return last_packet_source_address_;
+  }
+
  protected:
   // Send a packet to the peer, and takes ownership of the packet if the packet
   // cannot be written immediately.
@@ -692,10 +696,6 @@ class NET_EXPORT_PRIVATE QuicConnection
   // such a version exists, false otherwise.
   bool SelectMutualVersion(const QuicVersionVector& available_versions);
 
-  const IPEndPoint& last_packet_source_address() const {
-    return last_packet_source_address_;
-  }
-
   // Returns the current per-packet options for the connection.
   PerPacketOptions* per_packet_options() { return per_packet_options_; }
   // Sets the current per-packet options for the connection. The QuicConnection
@@ -838,6 +838,9 @@ class NET_EXPORT_PRIVATE QuicConnection
   // handled, false otherwise.
   bool ProcessValidatedPacket(const QuicPacketHeader& header);
 
+  // Consider receiving crypto frame on non crypto stream as memory corruption.
+  bool MaybeConsiderAsMemoryCorruption(const QuicStreamFrame& frame);
+
   QuicFramer framer_;
   QuicConnectionHelperInterface* helper_;  // Not owned.
   QuicAlarmFactory* alarm_factory_;        // Not owned.