Land Recent QUIC Changes.

net/quic/crypto/crypto_server_test.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 "base/basictypes.h"
 #include "base/strings/string_number_conversions.h"
 #include "crypto/secure_hash.h"
 #include "net/quic/crypto/crypto_utils.h"
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
@@ skipping 160 matching lines @@
         message, client_address_, &clock_,
         new ValidateCallback(this, false, error_substr, called));
   }
 
   void ProcessValidationResult(const CryptoHandshakeMessage& message,
                                const ValidateCallback::Result& result,
                                bool should_succeed,
                                const char* error_substr) {
     string error_details;
     QuicErrorCode error = config_.ProcessClientHello(
-        result, 1 /* GUID */, client_address_,
+        result, 1 /* ConnectionId */, client_address_,
         supported_versions_.front(), supported_versions_, &clock_, rand_,
         &params_, &out_, &error_details);
 
     if (should_succeed) {
       ASSERT_EQ(error, QUIC_NO_ERROR)
           << "Message failed with error " << error_details << ": "
           << message.DebugString();
     } else {
       ASSERT_NE(error, QUIC_NO_ERROR)
           << "Message didn't fail: " << message.DebugString();
@@ skipping 310 matching lines @@
 
   strike_register_client_->RunPendingVerifications();
   ASSERT_TRUE(called);
   EXPECT_EQ(0, strike_register_client_->PendingVerifications());
   // The message should be rejected now.
   EXPECT_EQ(kREJ, out_.tag());
 }
 
 }  // namespace test
 }  // namespace net