Break ChannelIDSigner into two classes: ChannelIDKey and ChannelIDSource.

net/quic/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/crypto/channel_id.h"
 
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 202 matching lines @@
     EXPECT_EQ(32u, qy.size());
     EXPECT_EQ(32u, r.size());
     EXPECT_EQ(32u, s.size());
 
     EXPECT_EQ(test_vector[i].result,
               ChannelIDVerifier::VerifyRaw(key, msg, signature, false));
   }
 }
 
 TEST(ChannelIDTest, SignAndVerify) {
-  scoped_ptr<ChannelIDSigner> signer(
-      CryptoTestUtils::ChannelIDSignerForTesting());
+  scoped_ptr<ChannelIDSource> source(
+      CryptoTestUtils::ChannelIDSourceForTesting());
 
   const string signed_data = "signed data";
   const string hostname = "foo.example.com";
-  string key, signature;
-  ASSERT_TRUE(signer->Sign(hostname, signed_data, &key, &signature));
+  scoped_ptr<ChannelIDKey> channel_id_key;
+  ASSERT_TRUE(source->GetChannelIDKey(hostname, &channel_id_key));
 
-  EXPECT_EQ(key, signer->GetKeyForHostname(hostname));
+  string signature;
+  ASSERT_TRUE(channel_id_key->Sign(signed_data, &signature));
 
+  string key = channel_id_key->SerializeKey();
   EXPECT_TRUE(ChannelIDVerifier::Verify(key, signed_data, signature));
 
   EXPECT_FALSE(ChannelIDVerifier::Verify("a" + key, signed_data, signature));
   EXPECT_FALSE(ChannelIDVerifier::Verify(key, "a" + signed_data, signature));
 
   scoped_ptr<char[]> bad_key(new char[key.size()]);
   memcpy(bad_key.get(), key.data(), key.size());
   bad_key[1] ^= 0x80;
   EXPECT_FALSE(ChannelIDVerifier::Verify(
       string(bad_key.get(), key.size()), signed_data, signature));
 
   scoped_ptr<char[]> bad_signature(new char[signature.size()]);
   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