Various QUIC cleanups to sync with internal code.

net/quic/quic_framer.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_framer.h"
 
 #include "base/containers/hash_tables.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_data_reader.h"
 #include "net/quic/quic_data_writer.h"
 
 using base::StringPiece;
 using std::make_pair;
 using std::map;
 using std::max;
 using std::min;
 using std::numeric_limits;
 using std::string;
 
+bool FLAGS_quic_allow_oversized_packets_for_test = false;
+
 namespace net {
 
 namespace {
 
 // Mask to select the lowest 48 bits of a sequence number.
 const QuicPacketSequenceNumber k6ByteSequenceNumberMask =
     GG_UINT64_C(0x0000FFFFFFFFFFFF);
 const QuicPacketSequenceNumber k4ByteSequenceNumberMask =
     GG_UINT64_C(0x00000000FFFFFFFF);
 const QuicPacketSequenceNumber k2ByteSequenceNumberMask =
@@ skipping 228 matching lines @@
     // Only truncate the first frame in a packet, so if subsequent ones go
     // over, stop including more frames.
     if (!first_frame) {
       return 0;
     }
     if (CanTruncate(quic_version_, frame, free_bytes)) {
       // Truncate the frame so the packet will not exceed kMaxPacketSize.
       // Note that we may not use every byte of the writer in this case.
       DVLOG(1) << "Truncating large frame";
       return free_bytes;
+    } else if (!FLAGS_quic_allow_oversized_packets_for_test) {
+      return 0;
     }
   }
   return frame_len;
 }
 
 QuicFramer::AckFrameInfo::AckFrameInfo() : max_delta(0) { }
 
 QuicFramer::AckFrameInfo::~AckFrameInfo() { }
 
 QuicPacketEntropyHash QuicFramer::GetPacketEntropyHash(
@@ skipping 1443 matching lines @@
       break;
     case PACKET_4BYTE_SEQUENCE_NUMBER:
       return writer->WriteUInt32(
           packet_sequence_number & k4ByteSequenceNumberMask);
       break;
     case PACKET_6BYTE_SEQUENCE_NUMBER:
       return writer->WriteUInt48(
           packet_sequence_number & k6ByteSequenceNumberMask);
       break;
     default:
-      NOTREACHED() << "sequence_number_length: " << sequence_number_length;
+      DCHECK(false) << "sequence_number_length: " << sequence_number_length;
       return false;
   }
 }
 
 bool QuicFramer::AppendStreamFramePayload(
     const QuicStreamFrame& frame,
     bool last_frame_in_packet,
     QuicDataWriter* writer) {
   if (!writer->WriteBytes(&frame.stream_id, GetStreamIdSize(frame.stream_id))) {
     return false;
@@ skipping 293 matching lines @@
 
 bool QuicFramer::RaiseError(QuicErrorCode error) {
   DVLOG(1) << "Error detail: " << detailed_error_;
   set_error(error);
   visitor_->OnError(this);
   reader_.reset(NULL);
   return false;
 }
 
 }  // namespace net