Various small QUIC cleanups after merging to Chrome.

net/quic/quic_connection.cc

Index: net/quic/quic_connection.cc
diff --git a/net/quic/quic_connection.cc b/net/quic/quic_connection.cc
index 1dc776a227de9e0528f64acbcbdf98328717fc33..98892464843f1d320e4215001f2bae86ec04d780 100644
--- a/net/quic/quic_connection.cc
+++ b/net/quic/quic_connection.cc
@@ -74,7 +74,7 @@ QuicConnection::UnackedPacket::UnackedPacket(QuicFrames unacked_frames)
 }
 
 QuicConnection::UnackedPacket::UnackedPacket(QuicFrames unacked_frames,
-                                             std::string data)
+                                             string data)
     : frames(unacked_frames),
       data(data) {
 }
@@ -482,9 +482,9 @@ void QuicConnection::OnPacketComplete() {
     DLOG(INFO) << "Got packet " << last_header_.packet_sequence_number
                << " with " << last_stream_frames_.size()
                << " stream frames for " << last_header_.public_header.guid;
-    congestion_manager_.RecordIncomingPacket(last_size_,
-        last_header_.packet_sequence_number, time_of_last_received_packet_,
-        last_packet_revived_);
+    congestion_manager_.RecordIncomingPacket(
+        last_size_, last_header_.packet_sequence_number,
+        time_of_last_received_packet_, last_packet_revived_);
   } else {
     DLOG(INFO) << "Got revived packet with " << last_stream_frames_.size()
                << " frames.";