Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

net/quic/core/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/core/crypto/cert_compressor.h"
 
 #include <memory>
 
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/platform/api/quic_text_utils.h"
@@ skipping 31 matching lines @@
                                               &chain2));
   EXPECT_EQ(chain.size(), chain2.size());
   EXPECT_EQ(chain[0], chain2[0]);
 }
 
 TEST(CertCompressor, Common) {
   std::vector<string> chain;
   chain.push_back("testcert");
   static const uint64_t set_hash = 42;
   std::unique_ptr<CommonCertSets> common_sets(
-      CryptoTestUtils::MockCommonCertSets(chain[0], set_hash, 1));
+      crypto_test_utils::MockCommonCertSets(chain[0], set_hash, 1));
   const string compressed = CertCompressor::CompressChain(
       chain,
       StringPiece(reinterpret_cast<const char*>(&set_hash), sizeof(set_hash)),
       StringPiece(), common_sets.get());
   EXPECT_EQ(
       "03"               /* common */
       "2a00000000000000" /* set hash 42 */
       "01000000"         /* index 1 */
       "00" /* end of list */,
       QuicTextUtils::HexEncode(compressed));
@@ skipping 45 matching lines @@
       cached_certs, nullptr, &chain));
 
   /* without a CommonCertSets */
   EXPECT_FALSE(CertCompressor::DecompressChain(
       QuicTextUtils::HexEncode("03"
                                "0000000000000000"
                                "00000000"),
       cached_certs, nullptr, &chain));
 
   std::unique_ptr<CommonCertSets> common_sets(
-      CryptoTestUtils::MockCommonCertSets("foo", 42, 1));
+      crypto_test_utils::MockCommonCertSets("foo", 42, 1));
 
   /* incorrect hash and index */
   EXPECT_FALSE(CertCompressor::DecompressChain(
       QuicTextUtils::HexEncode("03"
                                "a200000000000000"
                                "00000000"),
       cached_certs, nullptr, &chain));
 }
 
 }  // namespace test
 }  // namespace net