| Index: net/quic/core/crypto/quic_crypto_server_config.h
|
| diff --git a/net/quic/core/crypto/quic_crypto_server_config.h b/net/quic/core/crypto/quic_crypto_server_config.h
|
| index 42bcc1b20b7e2f6bda0433f907f9909c84d94cc1..f8f10ba3d458ff6e8e12dad9ae23cd9948b1524c 100644
|
| --- a/net/quic/core/crypto/quic_crypto_server_config.h
|
| +++ b/net/quic/core/crypto/quic_crypto_server_config.h
|
| @@ -19,7 +19,6 @@
|
| #include "base/synchronization/lock.h"
|
| #include "net/base/ip_address.h"
|
| #include "net/base/ip_endpoint.h"
|
| -#include "net/base/net_export.h"
|
| #include "net/quic/core/crypto/crypto_handshake.h"
|
| #include "net/quic/core/crypto/crypto_handshake_message.h"
|
| #include "net/quic/core/crypto/crypto_protocol.h"
|
| @@ -30,6 +29,7 @@
|
| #include "net/quic/core/proto/cached_network_parameters.pb.h"
|
| #include "net/quic/core/proto/source_address_token.pb.h"
|
| #include "net/quic/core/quic_time.h"
|
| +#include "net/quic/platform/api/quic_export.h"
|
| #include "net/quic/platform/api/quic_socket_address.h"
|
|
|
| namespace net {
|
| @@ -83,11 +83,12 @@ class PrimaryConfigChangedCallback {
|
| };
|
|
|
| // Callback used to accept the result of the |client_hello| validation step.
|
| -class NET_EXPORT_PRIVATE ValidateClientHelloResultCallback {
|
| +class QUIC_EXPORT_PRIVATE ValidateClientHelloResultCallback {
|
| public:
|
| // Opaque token that holds information about the client_hello and
|
| // its validity. Can be interpreted by calling ProcessClientHello.
|
| - struct NET_EXPORT_PRIVATE Result : public base::RefCountedThreadSafe<Result> {
|
| + struct QUIC_EXPORT_PRIVATE Result
|
| + : public base::RefCountedThreadSafe<Result> {
|
| Result(const CryptoHandshakeMessage& in_client_hello,
|
| QuicIpAddress in_client_ip,
|
| QuicWallTime in_now);
|
| @@ -115,7 +116,7 @@ class NET_EXPORT_PRIVATE ValidateClientHelloResultCallback {
|
| };
|
|
|
| // Callback used to accept the result of the ProcessClientHello method.
|
| -class NET_EXPORT_PRIVATE ProcessClientHelloResultCallback {
|
| +class QUIC_EXPORT_PRIVATE ProcessClientHelloResultCallback {
|
| public:
|
| ProcessClientHelloResultCallback();
|
| virtual ~ProcessClientHelloResultCallback();
|
| @@ -160,10 +161,10 @@ class RejectionObserver {
|
| // order to support clients resuming with a previous configuration.
|
| // TODO(agl): when adding configurations at runtime is added, this object will
|
| // need to consider locking.
|
| -class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
| +class QUIC_EXPORT_PRIVATE QuicCryptoServerConfig {
|
| public:
|
| // ConfigOptions contains options for generating server configs.
|
| - struct NET_EXPORT_PRIVATE ConfigOptions {
|
| + struct QUIC_EXPORT_PRIVATE ConfigOptions {
|
| ConfigOptions();
|
| ConfigOptions(const ConfigOptions& other);
|
| ~ConfigOptions();
|
| @@ -428,8 +429,8 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
|
|
| // Config represents a server config: a collection of preferences and
|
| // Diffie-Hellman public values.
|
| - class NET_EXPORT_PRIVATE Config : public QuicCryptoConfig,
|
| - public base::RefCounted<Config> {
|
| + class QUIC_EXPORT_PRIVATE Config : public QuicCryptoConfig,
|
| + public base::RefCounted<Config> {
|
| public:
|
| Config();
|
|
|
| @@ -785,7 +786,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerConfig {
|
| DISALLOW_COPY_AND_ASSIGN(QuicCryptoServerConfig);
|
| };
|
|
|
| -struct NET_EXPORT_PRIVATE QuicSignedServerConfig
|
| +struct QUIC_EXPORT_PRIVATE QuicSignedServerConfig
|
| : public base::RefCounted<QuicSignedServerConfig> {
|
| QuicSignedServerConfig();
|
|
|
|
|