commit 5f23a2d78434edd923a948c7f4f61bf2e7331e90
author nharper <nharper@google.com> Thu Feb 20 10:44:09 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Feb 20 10:44:57 2020 -0800
tree 4537f1cc39a23243d9d93232dec7e96e1a2ad5d0
parent a47c5c9d453b2bd9ad4acd786a27bb41352fcd8b

Move QuicCryptoServerStream::Helper to QuicCryptoServerStreamBase

gfe-relnote: rename class - no behavior change
PiperOrigin-RevId: 296246242
Change-Id: I68425fe4ba7a2040eed4bf93835639e6f353a406

quic/core/quic_crypto_server_stream.h

diff --git a/quic/core/quic_crypto_server_stream.h b/quic/core/quic_crypto_server_stream.h
index d6e621b..f96c45a 100644
--- a/quic/core/quic_crypto_server_stream.h
+++ b/quic/core/quic_crypto_server_stream.h
@@ -31,6 +31,20 @@
  public:
   explicit QuicCryptoServerStreamBase(QuicSession* session);
 
+  class QUIC_EXPORT_PRIVATE Helper {
+   public:
+    virtual ~Helper() {}
+
+    // Returns true if |message|, which was received on |self_address| is
+    // acceptable according to the visitor's policy. Otherwise, returns false
+    // and populates |error_details|.
+    virtual bool CanAcceptClientHello(const CryptoHandshakeMessage& message,
+                                      const QuicSocketAddress& client_address,
+                                      const QuicSocketAddress& peer_address,
+                                      const QuicSocketAddress& self_address,
+                                      std::string* error_details) const = 0;
+  };
+
   ~QuicCryptoServerStreamBase() override {}
 
   // Cancel any outstanding callbacks, such as asynchronous validation of client
@@ -136,20 +150,6 @@
     virtual size_t BufferSizeLimitForLevel(EncryptionLevel level) const = 0;
   };
 
-  class QUIC_EXPORT_PRIVATE Helper {
-   public:
-    virtual ~Helper() {}
-
-    // Returns true if |message|, which was received on |self_address| is
-    // acceptable according to the visitor's policy. Otherwise, returns false
-    // and populates |error_details|.
-    virtual bool CanAcceptClientHello(const CryptoHandshakeMessage& message,
-                                      const QuicSocketAddress& client_address,
-                                      const QuicSocketAddress& peer_address,
-                                      const QuicSocketAddress& self_address,
-                                      std::string* error_details) const = 0;
-  };
-
   QuicCryptoServerStream(const QuicCryptoServerStream&) = delete;
   QuicCryptoServerStream& operator=(const QuicCryptoServerStream&) = delete;
 
@@ -185,12 +185,12 @@
   CreateCryptoServerStream(const QuicCryptoServerConfig* crypto_config,
                            QuicCompressedCertsCache* compressed_certs_cache,
                            QuicSession* session,
-                           Helper* helper);
+                           QuicCryptoServerStreamBase::Helper* helper);
 
   QuicCryptoServerStream(const QuicCryptoServerConfig* crypto_config,
                          QuicCompressedCertsCache* compressed_certs_cache,
                          QuicSession* session,
-                         Helper* helper);
+                         QuicCryptoServerStreamBase::Helper* helper);
   // Provided so that subclasses can provide their own handshaker.
   // set_handshaker can only be called if this QuicCryptoServerStream's
   // handshaker hasn't been set yet. If set_handshaker is called outside of
@@ -199,14 +199,14 @@
   QuicCryptoServerStream(const QuicCryptoServerConfig* crypto_config,
                          QuicCompressedCertsCache* compressed_certs_cache,
                          QuicSession* session,
-                         Helper* helper,
+                         QuicCryptoServerStreamBase::Helper* helper,
                          std::unique_ptr<HandshakerInterface> handshaker);
   void set_handshaker(std::unique_ptr<HandshakerInterface> handshaker);
   HandshakerInterface* handshaker() const;
 
   const QuicCryptoServerConfig* crypto_config() const;
   QuicCompressedCertsCache* compressed_certs_cache() const;
-  Helper* helper() const;
+  QuicCryptoServerStreamBase::Helper* helper() const;
 
  private:
   std::unique_ptr<HandshakerInterface> handshaker_;
@@ -215,7 +215,7 @@
   // passed to the HandshakerInterface constructor in its late construction.
   const QuicCryptoServerConfig* crypto_config_;
   QuicCompressedCertsCache* compressed_certs_cache_;
-  Helper* helper_;
+  QuicCryptoServerStreamBase::Helper* helper_;
 };
 
 // Creates an appropriate QuicCryptoServerStream for the provided parameters,
@@ -226,7 +226,7 @@
 CreateCryptoServerStream(const QuicCryptoServerConfig* crypto_config,
                          QuicCompressedCertsCache* compressed_certs_cache,
                          QuicSession* session,
-                         QuicCryptoServerStream::Helper* helper);
+                         QuicCryptoServerStreamBase::Helper* helper);
 
 }  // namespace quic