Land Recent QUIC Changes.

net/quic/quic_sent_entropy_manager.h

Index: net/quic/quic_sent_entropy_manager.h
diff --git a/net/quic/quic_sent_entropy_manager.h b/net/quic/quic_sent_entropy_manager.h
index c89d97730de047f3797e85b98f4892da21042f50..e7730d569e5b4dfc79500a21a221b620995fe308 100644
--- a/net/quic/quic_sent_entropy_manager.h
+++ b/net/quic/quic_sent_entropy_manager.h
@@ -14,6 +14,10 @@
 
 namespace net {
 
+namespace test {
+class QuicConnectionPeer;
+}  // namespace test
+
 // Records all sent packets by a connection to track the cumulative entropy of
 // sent packets.  It is used by the connection to validate an ack
 // frame sent by the peer as a preventive measure against the optimistic ack
@@ -41,6 +45,8 @@ class NET_EXPORT_PRIVATE QuicSentEntropyManager {
   void ClearEntropyBefore(QuicPacketSequenceNumber sequence_number);
 
  private:
+  friend class test::QuicConnectionPeer;
+
   typedef linked_hash_map<QuicPacketSequenceNumber,
                           std::pair<QuicPacketEntropyHash,
                                QuicPacketEntropyHash> > SentEntropyMap;