Land Recent QUIC Changes

net/quic/crypto/quic_encrypter.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/quic_encrypter.h"
 #include "net/quic/crypto/null_encrypter.h"
 
 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:
       LOG(FATAL) << "Unsupported algorithm: " << algorithm;
       return NULL;
   }
 }
 
 }  // namespace net