Various small QUIC cleanups after merging to Chrome.

net/quic/quic_packet_creator.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_packet_creator.h"
 
 #include "base/logging.h"
 #include "net/quic/quic_utils.h"
 
 using base::StringPiece;
@@ skipping 75 matching lines @@
 
 bool QuicPacketCreator::HasPendingFrames() {
   return !queued_frames_.empty();
 }
 
 size_t QuicPacketCreator::BytesFree() {
   const size_t max_plaintext_size =
       framer_->GetMaxPlaintextSize(options_.max_packet_length);
   if (packet_size_ > max_plaintext_size) {
     return 0;
-  } else {
-    return max_plaintext_size - packet_size_;
   }
+  return max_plaintext_size - packet_size_;
 }
 
 bool QuicPacketCreator::AddFrame(const QuicFrame& frame) {
   size_t frame_len = framer_->GetSerializedFrameLength(
       frame, BytesFree(), queued_frames_.empty());
   if (frame_len == 0) {
     return false;
   }
   packet_size_ += frame_len;
   queued_frames_.push_back(frame);
@@ skipping 51 matching lines @@
   header->packet_sequence_number = ++sequence_number_;
   header->fec_group = fec_group;
 }
 
 bool QuicPacketCreator::ShouldRetransmit(const QuicFrame& frame) {
   return frame.type != ACK_FRAME && frame.type != CONGESTION_FEEDBACK_FRAME &&
       frame.type != PADDING_FRAME;
 }
 
 }  // namespace net