Per-packet options now passed through to QuicPacketWriter, instead of

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 e89afe0aaa46c5345f08070e537a3126d4c696d7..85a8ee4ea3b29b974e9da595d76a866835436ef4 100644
--- a/net/quic/quic_connection.h
+++ b/net/quic/quic_connection.h
@@ -689,6 +689,15 @@ class NET_EXPORT_PRIVATE QuicConnection
     return migrating_peer_ip_;
   }
 
+  // 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
+  // does not take ownership of |options|; |options| must live for as long as
+  // the QuicConnection is in use.
+  void set_per_packet_options(PerPacketOptions* options) {
+    per_packet_options_ = options;
+  }
+
  private:
   friend class test::QuicConnectionPeer;
   friend class test::PacketSavingConnection;
@@ -814,6 +823,7 @@ class NET_EXPORT_PRIVATE QuicConnection
 
   QuicFramer framer_;
   QuicConnectionHelperInterface* helper_;  // Not owned.
+  PerPacketOptions* per_packet_options_;   // Not owned.
   QuicPacketWriter* writer_;  // Owned or not depending on |owns_writer_|.
   bool owns_writer_;
   // Encryption level for new packets. Should only be changed via