Land Recent QUIC changes

net/quic/crypto/crypto_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 <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/crypto_framer.h"
@@ skipping 31 matching lines @@
       const CryptoHandshakeMessage& message) OVERRIDE {
     messages_.push_back(message);
   }
 
   // Counters from the visitor callbacks.
   int error_count_;
 
   vector<CryptoHandshakeMessage> messages_;
 };
 
-TEST(CryptoFramerTest, MakeCryptoTag) {
-  CryptoTag tag = MakeQuicTag('A', 'B', 'C', 'D');
-  char bytes[4];
-  memcpy(bytes, &tag, 4);
-  EXPECT_EQ('A', bytes[0]);
-  EXPECT_EQ('B', bytes[1]);
-  EXPECT_EQ('C', bytes[2]);
-  EXPECT_EQ('D', bytes[3]);
-}
-
 TEST(CryptoFramerTest, ConstructHandshakeMessage) {
   CryptoHandshakeMessage message;
   message.set_tag(0xFFAA7733);
   message.SetStringPiece(0x12345678, "abcdef");
   message.SetStringPiece(0x12345679, "ghijk");
   message.SetStringPiece(0x1234567A, "lmnopqr");
 
   unsigned char packet[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
@@ skipping 277 matching lines @@
     // tag 1
     0x79, 0x56, 0x34, 0x12,
     // end offset 1
     0x01, 0x00, 0x00, 0x00,
     // tag 2
     0x78, 0x56, 0x34, 0x13,
     // end offset 2
     0x00, 0x00, 0x00, 0x00,
   };
 
-  EXPECT_FALSE(framer.ProcessInput(StringPiece(AsChars(input),
-                                               arraysize(input))));
+  EXPECT_FALSE(
+      framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
   EXPECT_EQ(QUIC_CRYPTO_TAGS_OUT_OF_ORDER, framer.error());
 }
 
 TEST(CryptoFramerTest, ProcessInputTooManyEntries) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0xA0, 0x00,
     // padding
     0x00, 0x00,
   };
 
-  EXPECT_FALSE(framer.ProcessInput(StringPiece(AsChars(input),
-                                               arraysize(input))));
+  EXPECT_FALSE(
+      framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
   EXPECT_EQ(QUIC_CRYPTO_TOO_MANY_ENTRIES, framer.error());
 }
 
 TEST(CryptoFramerTest, ProcessInputZeroLength) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x02, 0x00,
     // padding
     0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
     // end offset 1
     0x00, 0x00, 0x00, 0x00,
     // tag 2
     0x79, 0x56, 0x34, 0x12,
     // end offset 2
     0x05, 0x00, 0x00, 0x00,
   };
 
-  EXPECT_TRUE(framer.ProcessInput(StringPiece(AsChars(input),
-                                              arraysize(input))));
+  EXPECT_TRUE(
+      framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
 }
 
 }  // namespace test
 
 }  // namespace net