Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_session.cc

Index: net/quic/core/quic_session.cc
diff --git a/net/quic/core/quic_session.cc b/net/quic/core/quic_session.cc
index c3bf20ba2b1d5eb47f9553466b3bb0449f66cf91..b771ac6f77db744f5785575e02bb1a468adcd378 100644
--- a/net/quic/core/quic_session.cc
+++ b/net/quic/core/quic_session.cc
@@ -40,7 +40,7 @@ QuicSession::QuicSession(QuicConnection* connection, const QuicConfig& config)
       num_draining_incoming_streams_(0),
       num_locally_closed_incoming_streams_highest_offset_(0),
       error_(QUIC_NO_ERROR),
-      flow_controller_(connection_.get(),
+      flow_controller_(connection_,
                        0,
                        perspective(),
                        kMinimumFlowControlSendWindow,
@@ -185,7 +185,7 @@ void QuicSession::OnCanWrite() {
   }
 
   QuicConnection::ScopedPacketBundler ack_bundler(
-      connection_.get(), QuicConnection::SEND_ACK_IF_QUEUED);
+      connection_, QuicConnection::SEND_ACK_IF_QUEUED);
   for (size_t i = 0; i < num_writes; ++i) {
     if (!(write_blocked_streams_.HasWriteBlockedCryptoOrHeadersStream() ||
           write_blocked_streams_.HasWriteBlockedDataStreams())) {