Land Recent QUIC changes.

net/quic/crypto/strike_register.h

 // Copyright (c) 2013 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.
 
 #ifndef NET_QUIC_CRYPTO_STRIKE_REGISTER_H_
 #define NET_QUIC_CRYPTO_STRIKE_REGISTER_H_
 
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 57 matching lines @@
     NO_STARTUP_PERIOD_NEEDED,
   };
 
   // An external node takes 24 bytes as we don't record the orbit.
   static const uint32 kExternalNodeSize;
 
   // We address the nodes by their index in the array. This means that 0 is a
   // valid index. Therefore this is our invalid index. It also has a one bit
   // in the LSB position because we tend to store indexes shifted up 8 bits
   // and this distinguishes kNil from (kExternalFlag | 0) << 8.
-  static const uint32  kNil;
+  static const uint32 kNil;
 
   // Our pointers from internal nodes can either point to an internal or
   // external node. We flag the 24th bit to mark a pointer as external.
   static const uint32 kExternalFlag;
 
   // Construct a new set which can hold, at most, |max_entries| (which must be
   // less than 2**23). See the comments around StartupType about initial
   // behaviour. Otherwise, all nonces that are outside +/- |window_secs| from
   // the current time will be rejected. Additionally, all nonces that have an
   // orbit value other than |orbit| will be rejected.
@@ skipping 91 matching lines @@
   uint32 internal_node_head_;
   // internal_nodes_ can't be a scoped_ptr because the type isn't defined in
   // this header.
   InternalNode* internal_nodes_;
   scoped_ptr<uint8[]> external_nodes_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_STRIKE_REGISTER_H_