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

net/quic/core/crypto/channel_id_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/core/crypto/channel_id.h"
 
 #include <memory>
 
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 265 matching lines @@
 
     EXPECT_EQ(test_vector[i].result,
               ChannelIDVerifier::VerifyRaw(
                   StringPiece(key, sizeof(key)), StringPiece(msg, msg_len),
                   StringPiece(signature, sizeof(signature)), false));
   }
 }
 
 TEST(ChannelIDTest, SignAndVerify) {
   std::unique_ptr<ChannelIDSource> source(
-      CryptoTestUtils::ChannelIDSourceForTesting());
+      crypto_test_utils::ChannelIDSourceForTesting());
 
   const string signed_data = "signed data";
   const string hostname = "foo.example.com";
   std::unique_ptr<ChannelIDKey> channel_id_key;
   QuicAsyncStatus status =
       source->GetChannelIDKey(hostname, &channel_id_key, nullptr);
   ASSERT_EQ(QUIC_SUCCESS, status);
 
   string signature;
   ASSERT_TRUE(channel_id_key->Sign(signed_data, &signature));
@@ skipping 14 matching lines @@
   memcpy(bad_signature.get(), signature.data(), signature.size());
   bad_signature[1] ^= 0x80;
   EXPECT_FALSE(ChannelIDVerifier::Verify(
       key, signed_data, string(bad_signature.get(), signature.size())));
 
   EXPECT_FALSE(ChannelIDVerifier::Verify(key, "wrong signed data", signature));
 }
 
 }  // namespace test
 }  // namespace net