Land Recent QUIC Changes

net/quic/crypto/quic_encrypter.cc

Index: net/quic/crypto/quic_encrypter.cc
diff --git a/net/quic/crypto/quic_encrypter.cc b/net/quic/crypto/quic_encrypter.cc
index cc1301332c41568ac1cf7b6e1c8a41a03d73d68c..ec521ecd3a9d31dd23b07d829ed2852db3ef26bb 100644
--- a/net/quic/crypto/quic_encrypter.cc
+++ b/net/quic/crypto/quic_encrypter.cc
@@ -10,6 +10,10 @@ namespace net {
 // static
 QuicEncrypter* QuicEncrypter::Create(CryptoTag algorithm) {
   switch (algorithm) {
+    case kAESG:
+      // TODO(wtc): add support for Aes128GcmEncrypter.
+      // return new Aes128GcmEncrypter();
+      return new NullEncrypter();
     case kNULL:
       return new NullEncrypter();
     default: