Land Recent QUIC changes

net/quic/quic_config.cc

 // 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.
 
 #include "net/quic/quic_config.h"
 
 using std::string;
 
 namespace net {
 
@@ skipping 11 matching lines @@
 }
 
 void QuicConfig::SetDefaults() {
   idle_connection_state_lifetime_ = QuicTime::Delta::FromSeconds(300);
   keepalive_timeout_ = QuicTime::Delta::Zero();
   congestion_control_.clear();
   congestion_control_.push_back(kQBIC);
 }
 
 bool QuicConfig::SetFromHandshakeMessage(const CryptoHandshakeMessage& scfg) {
-  const CryptoTag* cgst;
+  const QuicTag* cgst;
   size_t num_cgst;
   QuicErrorCode error;
 
   error = scfg.GetTaglist(kCGST, &cgst, &num_cgst);
   if (error != QUIC_NO_ERROR) {
     return false;
   }
 
   congestion_control_.assign(cgst, cgst + num_cgst);
 
@@ skipping 23 matching lines @@
   out->SetVector(kCGST, congestion_control_);
 }
 
 QuicErrorCode QuicConfig::ProcessFinalPeerHandshake(
     const CryptoHandshakeMessage& msg,
     CryptoUtils::Priority priority,
     QuicNegotiatedParameters* out_params,
     string* error_details) const {
   DCHECK(error_details != NULL);
 
-  const CryptoTag* their_congestion_controls;
+  const QuicTag* their_congestion_controls;
   size_t num_their_congestion_controls;
   QuicErrorCode error;
 
   error = msg.GetTaglist(kCGST, &their_congestion_controls,
                          &num_their_congestion_controls);
   if (error != QUIC_NO_ERROR) {
     *error_details = "Missing CGST";
     return error;
   }
 
@@ skipping 33 matching lines @@
     default:
       *error_details = "Bad KATO";
       return error;
   }
 
   return QUIC_NO_ERROR;
 }
 
 }  // namespace net