Break ChannelIDSigner into two classes: ChannelIDKey and ChannelIDSource.

net/quic/test_tools/crypto_test_utils.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 
 #include <stdarg.h>
 
 #include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_piece.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/quic_framer.h"
 #include "net/quic/quic_protocol.h"
 
 namespace net {
 
-class ChannelIDSigner;
+class ChannelIDSource;
 class CommonCertSets;
 class ProofSource;
 class ProofVerifier;
 class ProofVerifyContext;
 class QuicClock;
 class QuicConfig;
 class QuicCryptoClientStream;
 class QuicCryptoServerConfig;
 class QuicCryptoServerStream;
 class QuicCryptoStream;
 class QuicRandom;
 
 namespace test {
 
 class PacketSavingConnection;
 
 class CryptoTestUtils {
  public:
   // FakeClientOptions bundles together a number of options for configuring
   // HandshakeWithFakeClient.
   struct FakeClientOptions {
     FakeClientOptions();
 
     // If dont_verify_certs is true then no ProofVerifier is set on the client.
     // Thus no certificates will be requested or checked.
     bool dont_verify_certs;
 
     // If channel_id_enabled is true then the client will attempt to send a
-    // ChannelID. The key will be the same as is returned by
-    // ChannelIDSigner's |GetKeyForHostname|.
+    // ChannelID.
     bool channel_id_enabled;
   };
 
   // returns: the number of client hellos that the client sent.
   static int HandshakeWithFakeServer(PacketSavingConnection* client_conn,
                                      QuicCryptoClientStream* client);
 
   // returns: the number of client hellos that the client sent.
   static int HandshakeWithFakeClient(PacketSavingConnection* server_conn,
                                      QuicCryptoServerStream* server,
@@ skipping 63 matching lines @@
   //       NULL);
   static CryptoHandshakeMessage Message(const char* message_tag, ...);
 
   // BuildMessage is the same as |Message|, but takes the variable arguments
   // explicitly. TODO(rtenneti): Investigate whether it'd be better for
   // Message() and BuildMessage() to return a CryptoHandshakeMessage* pointer
   // instead, to avoid copying the return value.
   static CryptoHandshakeMessage BuildMessage(const char* message_tag,
                                              va_list ap);
 
-  // ChannelIDSignerForTesting returns a ChannelIDSigner that generates keys
-  // deterministically based on the hostname given in the Sign call.
-  static ChannelIDSigner* ChannelIDSignerForTesting();
+  // ChannelIDSourceForTesting returns a ChannelIDSource that generates keys
+  // deterministically based on the hostname given in the GetChannelID call.
+  static ChannelIDSource* ChannelIDSourceForTesting();
 
  private:
   static void CompareClientAndServerKeys(QuicCryptoClientStream* client,
                                          QuicCryptoServerStream* server);
 
   DISALLOW_COPY_AND_ASSIGN(CryptoTestUtils);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_