Various small QUIC cleanups after merging to Chrome.

net/quic/quic_framer_test.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 <algorithm>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/hash_tables.h"
@@ skipping 329 matching lines @@
 
     // but large numbers should not (even if they're out of order).
     for (uint64 j = 0; j < 10; j++) {
       uint64 num = kEpoch - 1 - j;
       CheckCalculatePacketSequenceNumber(cur_epoch + num, last);
     }
   }
 }
 
 TEST_F(QuicFramerTest, CalculatePacketSequenceNumberFromWireNearNextMax) {
-  const uint64 max_number = std::numeric_limits<uint64>::max();
+  const uint64 max_number = numeric_limits<uint64>::max();
   const uint64 max_epoch = max_number & ~kMask;
 
   // Cases where the last number was close to the end of the range
   for (uint64 i = 0; i < 10; i++) {
     QuicPacketSequenceNumber last = max_number - i;
 
     // Small numbers should not wrap (because they have nowhere to go.
     for (uint64 j = 0; j < 10; j++) {
       CheckCalculatePacketSequenceNumber(max_epoch + j, last);
     }
@@ skipping 1659 matching lines @@
 
   original_raw_length = raw_close_packet->length();
   raw_close_packet.reset(
       framer_.ConstructFrameDataPacket(header, frames));
   ASSERT_TRUE(raw_ack_packet != NULL);
   EXPECT_EQ(original_raw_length, raw_close_packet->length());
 }
 
 }  // namespace test
 }  // namespace net