Various small QUIC cleanups after merging to Chrome.

net/quic/quic_connection.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/quic_connection.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 56 matching lines @@
   return delta <= kMaxPacketGap;
 }
 
 }  // namespace
 
 QuicConnection::UnackedPacket::UnackedPacket(QuicFrames unacked_frames)
     : frames(unacked_frames) {
 }
 
 QuicConnection::UnackedPacket::UnackedPacket(QuicFrames unacked_frames,
-                                             std::string data)
+                                             string data)
     : frames(unacked_frames),
       data(data) {
 }
 
 QuicConnection::UnackedPacket::~UnackedPacket() {
 }
 
 QuicConnection::QuicConnection(QuicGuid guid,
                                IPEndPoint address,
                                QuicConnectionHelperInterface* helper)
@@ skipping 387 matching lines @@
   DLOG(INFO) << "Connection closed with error "
              << QuicUtils::ErrorToString(frame.error_code);
   CloseConnection(frame.error_code, true);
 }
 
 void QuicConnection::OnPacketComplete() {
   if (!last_packet_revived_) {
     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.";
   }
 
   if (last_stream_frames_.empty() ||
       visitor_->OnPacket(self_address_, peer_address_,
                          last_header_, last_stream_frames_)) {
     RecordPacketReceived(last_header_);
   }
@@ skipping 560 matching lines @@
            << " delta:" << delta.ToMicroseconds();
   if (delta >= timeout_) {
     SendConnectionClose(QUIC_CONNECTION_TIMED_OUT);
     return true;
   }
   helper_->SetTimeoutAlarm(timeout_.Subtract(delta));
   return false;
 }
 
 }  // namespace net