Land Recent QUIC changes

net/quic/crypto/null_decrypter_test.cc

Index: net/quic/crypto/null_decrypter_test.cc
diff --git a/net/quic/crypto/null_decrypter_test.cc b/net/quic/crypto/null_decrypter_test.cc
index 7854b04aaf97fd810fcbd0b871560e253418666a..e9b9647d202fc0cd6ec5ca9fd40ba9ca14cfea12 100644
--- a/net/quic/crypto/null_decrypter_test.cc
+++ b/net/quic/crypto/null_decrypter_test.cc
@@ -22,11 +22,9 @@ TEST(NullDecrypterTest, Decrypt) {
     'b',  'y',  'e',  '!',
   };
   NullDecrypter decrypter;
-  scoped_ptr<QuicData> decrypted(
-      decrypter.DecryptPacket(
-        0, "hello world!",
-        StringPiece(reinterpret_cast<const char*>(expected),
-                    arraysize(expected))));
+  scoped_ptr<QuicData> decrypted(decrypter.DecryptPacket(
+      0, "hello world!", StringPiece(reinterpret_cast<const char*>(expected),
+                                     arraysize(expected))));
   ASSERT_TRUE(decrypted.get());
   EXPECT_EQ("goodbye!", decrypted->AsStringPiece());
 }
@@ -43,11 +41,9 @@ TEST(NullDecrypterTest, BadHash) {
     'b',  'y',  'e',  '!',
   };
   NullDecrypter decrypter;
-  scoped_ptr<QuicData> decrypted(
-      decrypter.DecryptPacket(
-        0, "hello world!",
-        StringPiece(reinterpret_cast<const char*>(expected),
-                    arraysize(expected))));
+  scoped_ptr<QuicData> decrypted(decrypter.DecryptPacket(
+      0, "hello world!", StringPiece(reinterpret_cast<const char*>(expected),
+                                     arraysize(expected))));
   ASSERT_FALSE(decrypted.get());
 }
 
@@ -60,11 +56,9 @@ TEST(NullDecrypterTest, ShortInput) {
     0x88, 0x79, 0xca,
   };
   NullDecrypter decrypter;
-  scoped_ptr<QuicData> decrypted(
-      decrypter.DecryptPacket(
-        0, "hello world!",
-        StringPiece(reinterpret_cast<const char*>(expected),
-                    arraysize(expected))));
+  scoped_ptr<QuicData> decrypted(decrypter.DecryptPacket(
+      0, "hello world!", StringPiece(reinterpret_cast<const char*>(expected),
+                                     arraysize(expected))));
   ASSERT_FALSE(decrypted.get());
 }