Landing Recent QUIC changes until 9/2/2015 17:00 UTC.

net/quic/crypto/null_decrypter.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/crypto/null_decrypter.h"
+
 #include <stdint.h>
 
-#include "net/quic/crypto/null_decrypter.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/quic_data_reader.h"
 
 using base::StringPiece;
 using std::string;
 
 namespace net {
 
 NullDecrypter::NullDecrypter() {}
 
@@ skipping 59 matching lines @@
                                    const StringPiece& data2) const {
   uint128 correct_hash = QuicUtils::FNV1a_128_Hash_Two(
       data1.data(), data1.length(), data2.data(), data2.length());
   uint128 mask(UINT64_C(0x0), UINT64_C(0xffffffff));
   mask <<= 96;
   correct_hash &= ~mask;
   return correct_hash;
 }
 
 }  // namespace net