Landing Recent QUIC changes until 2/12/2016 21:32 UTC

net/quic/crypto/quic_crypto_server_config_test.cc

 // Copyright 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/crypto/quic_crypto_server_config.h"
 
 #include <stdarg.h>
 
 #include "base/stl_util.h"
 #include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
@@ skipping 444 matching lines @@
   QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand,
                                 CryptoTestUtils::ProofSourceForTesting());
   QuicCryptoServerConfigPeer peer(&server);
 
   StringPiece message("hello world");
   const size_t key_size = CryptoSecretBoxer::GetKeySize();
   scoped_ptr<uint8_t[]> key(new uint8_t[key_size]);
   memset(key.get(), 0x11, key_size);
 
   CryptoSecretBoxer boxer;
-  boxer.SetKey(StringPiece(reinterpret_cast<char*>(key.get()), key_size));
+  boxer.SetKeys({string(reinterpret_cast<char*>(key.get()), key_size)});
   const string box = boxer.Box(rand, message);
   MockClock clock;
   QuicWallTime now = clock.WallNow();
   const QuicWallTime original_time = now;
   EXPECT_EQ(SERVER_NONCE_DECRYPTION_FAILURE,
             peer.ValidateServerNonce(box, now));
 
   string server_nonce = peer.NewServerNonce(rand, now);
   EXPECT_EQ(HANDSHAKE_OK, peer.ValidateServerNonce(server_nonce, now));
   EXPECT_EQ(SERVER_NONCE_NOT_UNIQUE_FAILURE,
@@ skipping 184 matching lines @@
 TEST_F(CryptoServerConfigsTest, InvalidConfigs) {
   // Ensure that invalid configs don't change anything.
   SetConfigs("a", 800, 1, "b", 900, 1, "c", 1100, 1, nullptr);
   test_peer_.CheckConfigs("a", false, "b", true, "c", false, nullptr);
   SetConfigs("a", 800, 1, "c", 1100, 1, "INVALID1", 1000, 1, nullptr);
   test_peer_.CheckConfigs("a", false, "b", true, "c", false, nullptr);
 }
 
 }  // namespace test
 }  // namespace net