Land Recent QUIC changes.

net/quic/crypto/cert_compressor_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 "net/quic/crypto/cert_compressor.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 29 matching lines @@
   ASSERT_TRUE(
       CertCompressor::DecompressChain(compressed, cached_certs, NULL, &chain2));
   EXPECT_EQ(chain.size(), chain2.size());
   EXPECT_EQ(chain[0], chain2[0]);
 }
 
 TEST(CertCompressor, Common) {
   vector<string> chain;
   chain.push_back("testcert");
   static const uint64 set_hash = 42;
-  scoped_ptr<CommonCertSets> common_set(
+  scoped_ptr<CommonCertSets> common_sets(
       CryptoTestUtils::MockCommonCertSets(chain[0], set_hash, 1));
   const string compressed = CertCompressor::CompressChain(
       chain,
       StringPiece(reinterpret_cast<const char*>(&set_hash), sizeof(set_hash)),
-      StringPiece(), common_set.get());
+      StringPiece(), common_sets.get());
   const string common("03"               /* common */
                       "2A00000000000000" /* set hash 42 */
                       "01000000"         /* index 1 */
                       "00"               /* end of list */);
   EXPECT_EQ(common.data(),
             base::HexEncode(compressed.data(), compressed.size()));
 
   vector<string> chain2, cached_certs;
   ASSERT_TRUE(CertCompressor::DecompressChain(compressed, cached_certs,
-                                              common_set.get(), &chain2));
+                                              common_sets.get(), &chain2));
   EXPECT_EQ(chain.size(), chain2.size());
   EXPECT_EQ(chain[0], chain2[0]);
 }
 
 TEST(CertCompressor, Cached) {
   vector<string> chain;
   chain.push_back("testcert");
   uint64 hash = QuicUtils::FNV1a_64_Hash(chain[0].data(), chain[0].size());
   StringPiece hash_bytes(reinterpret_cast<char*>(&hash), sizeof(hash));
   const string compressed =
@@ skipping 41 matching lines @@
       cached_certs, NULL, &chain));
 
   /* without a CommonCertSets */
   const string without_a_common_cert_set(
       "03" "0000000000000000" "00000000");
   EXPECT_FALSE(CertCompressor::DecompressChain(
       base::HexEncode(without_a_common_cert_set.data(),
                       without_a_common_cert_set.size()),
       cached_certs, NULL, &chain));
 
-  scoped_ptr<CommonCertSets> common_set(
+  scoped_ptr<CommonCertSets> common_sets(
       CryptoTestUtils::MockCommonCertSets("foo", 42, 1));
 
   /* incorrect hash and index */
   const string incorrect_hash_and_index(
       "03" "a200000000000000" "00000000");
   EXPECT_FALSE(CertCompressor::DecompressChain(
       base::HexEncode(incorrect_hash_and_index.data(),
                       incorrect_hash_and_index.size()),
       cached_certs, NULL, &chain));
 }
 
 }  // namespace test
 }  // namespace net