Land Recent QUIC changes

net/quic/crypto/crypto_server_config_protobuf.h

 // Copyright (c) 2013 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.
 
 #ifndef NET_QUIC_CRYPTO_CRYPTO_SERVER_CONFIG_PROTOBUF_H_
 #define NET_QUIC_CRYPTO_CRYPTO_SERVER_CONFIG_PROTOBUF_H_
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "net/quic/crypto/crypto_protocol.h"
 
 namespace net {
 
 // TODO(rch): sync with server more rationally.
 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 {
       return private_key_;
     }
     void set_private_key(std::string key) {
       private_key_ = key;
     }
 
    private:
-    CryptoTag tag_;
+    QuicTag tag_;
     std::string private_key_;
   };
 
   QuicServerConfigProtobuf();
   ~QuicServerConfigProtobuf();
 
   size_t key_size() const {
     return keys_.size();
   }
 
@@ skipping 16 matching lines @@
   }
 
  private:
   std::vector<PrivateKey*> keys_;
   std::string config_;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_CRYPTO_SERVER_CONFIG_PROTOBUF_H_