Land Recent QUIC changes

net/quic/crypto/crypto_server_config_protobuf.h

Index: net/quic/crypto/crypto_server_config_protobuf.h
diff --git a/net/quic/crypto/crypto_server_config_protobuf.h b/net/quic/crypto/crypto_server_config_protobuf.h
index a4ef81b98c93d2d6c390609e08cf0463d8fe41aa..62b7b6fb23973a23aa8d4ade71d8e1d3ffafcc55 100644
--- a/net/quic/crypto/crypto_server_config_protobuf.h
+++ b/net/quic/crypto/crypto_server_config_protobuf.h
@@ -19,10 +19,10 @@ class QuicServerConfigProtobuf {
  public:
   class PrivateKey {
    public:
-    CryptoTag tag() const {
+    QuicTag tag() const {
       return tag_;
     }
-    void set_tag(CryptoTag tag) {
+    void set_tag(QuicTag tag) {
       tag_ = tag;
     }
     std::string private_key() const {
@@ -33,7 +33,7 @@ class QuicServerConfigProtobuf {
     }
 
    private:
-    CryptoTag tag_;
+    QuicTag tag_;
     std::string private_key_;
   };