Landing Recent QUIC Changes.

net/quic/quic_crypto_server_stream.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/quic_crypto_server_stream.h"
 
 #include "base/base64.h"
 #include "crypto/secure_hash.h"
 #include "net/quic/crypto/crypto_protocol.h"
 #include "net/quic/crypto/crypto_utils.h"
@@ skipping 152 matching lines @@
   CryptoHandshakeMessage server_config_update_message;
   if (!crypto_config_.BuildServerConfigUpdateMessage(
           session()->connection()->peer_address(),
           session()->connection()->clock(),
           session()->connection()->random_generator(),
           crypto_negotiated_params_, &server_config_update_message)) {
     DVLOG(1) << "Server: Failed to build server config update (SCUP)!";
     return;
   }
 
-  DVLOG(1) << "Server: Sending server config update (SCUP): "
+  DVLOG(1) << "Server: Sending server config update: "
            << server_config_update_message.DebugString();
   const QuicData& data = server_config_update_message.GetSerialized();
   WriteOrBufferData(string(data.data(), data.length()), false, NULL);
 
   ++num_server_config_update_messages_sent_;
 }
 
 void QuicCryptoServerStream::OnServerHelloAcked() {
   session()->connection()->OnHandshakeComplete();
 }
@@ skipping 57 matching lines @@
 
 void QuicCryptoServerStream::ValidateCallback::RunImpl(
     const CryptoHandshakeMessage& client_hello,
     const Result& result) {
   if (parent_ != NULL) {
     parent_->FinishProcessingHandshakeMessage(client_hello, result);
   }
 }
 
 }  // namespace net