| Index: net/quic/quic_config.h
|
| diff --git a/net/quic/quic_config.h b/net/quic/quic_config.h
|
| index 7be4569257ce88e71f28b8b574a2e92146ea9f3b..5328ef61710a68caa059f8171f3122274c9c5c27 100644
|
| --- a/net/quic/quic_config.h
|
| +++ b/net/quic/quic_config.h
|
| @@ -61,7 +61,7 @@ class NET_EXPORT_PRIVATE QuicConfigValue {
|
| class NET_EXPORT_PRIVATE QuicNegotiableValue : public QuicConfigValue {
|
| public:
|
| QuicNegotiableValue(QuicTag tag, QuicConfigPresence presence);
|
| - virtual ~QuicNegotiableValue();
|
| + ~QuicNegotiableValue() override;
|
|
|
| bool negotiated() const {
|
| return negotiated_;
|
| @@ -75,7 +75,7 @@ class NET_EXPORT_PRIVATE QuicNegotiableUint32 : public QuicNegotiableValue {
|
| public:
|
| // Default and max values default to 0.
|
| QuicNegotiableUint32(QuicTag name, QuicConfigPresence presence);
|
| - virtual ~QuicNegotiableUint32();
|
| + ~QuicNegotiableUint32() override;
|
|
|
| // Sets the maximum possible value that can be achieved after negotiation and
|
| // also the default values to be assumed if PRESENCE_OPTIONAL and the *HLO msg
|
| @@ -89,16 +89,15 @@ class NET_EXPORT_PRIVATE QuicNegotiableUint32 : public QuicNegotiableValue {
|
|
|
| // Serialises |name_| and value to |out|. If |negotiated_| is true then
|
| // |negotiated_value_| is serialised, otherwise |max_value_| is serialised.
|
| - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
| + void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
|
|
| // Sets |negotiated_value_| to the minimum of |max_value_| and the
|
| // corresponding value from |peer_hello|. If the corresponding value is
|
| // missing and PRESENCE_OPTIONAL then |negotiated_value_| is set to
|
| // |default_value_|.
|
| - virtual QuicErrorCode ProcessPeerHello(
|
| - const CryptoHandshakeMessage& peer_hello,
|
| - HelloType hello_type,
|
| - std::string* error_details) override;
|
| + QuicErrorCode ProcessPeerHello(const CryptoHandshakeMessage& peer_hello,
|
| + HelloType hello_type,
|
| + std::string* error_details) override;
|
|
|
| private:
|
| uint32 max_value_;
|
| @@ -109,7 +108,7 @@ class NET_EXPORT_PRIVATE QuicNegotiableUint32 : public QuicNegotiableValue {
|
| class NET_EXPORT_PRIVATE QuicNegotiableTag : public QuicNegotiableValue {
|
| public:
|
| QuicNegotiableTag(QuicTag name, QuicConfigPresence presence);
|
| - virtual ~QuicNegotiableTag();
|
| + ~QuicNegotiableTag() override;
|
|
|
| // Sets the possible values that |negotiated_tag_| can take after negotiation
|
| // and the default value that |negotiated_tag_| takes if OPTIONAL and *HLO
|
| @@ -123,15 +122,14 @@ class NET_EXPORT_PRIVATE QuicNegotiableTag : public QuicNegotiableValue {
|
| // Serialises |name_| and vector (either possible or negotiated) to |out|. If
|
| // |negotiated_| is true then |negotiated_tag_| is serialised, otherwise
|
| // |possible_values_| is serialised.
|
| - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
| + void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
|
|
| // Selects the tag common to both tags in |client_hello| for |name_| and
|
| // |possible_values_| with preference to tag in |possible_values_|. The
|
| // selected tag is set as |negotiated_tag_|.
|
| - virtual QuicErrorCode ProcessPeerHello(
|
| - const CryptoHandshakeMessage& peer_hello,
|
| - HelloType hello_type,
|
| - std::string* error_details) override;
|
| + QuicErrorCode ProcessPeerHello(const CryptoHandshakeMessage& peer_hello,
|
| + HelloType hello_type,
|
| + std::string* error_details) override;
|
|
|
| private:
|
| // Reads the vector corresponding to |name_| from |msg| into |out|. If the
|
| @@ -151,7 +149,7 @@ class NET_EXPORT_PRIVATE QuicNegotiableTag : public QuicNegotiableValue {
|
| class NET_EXPORT_PRIVATE QuicFixedUint32 : public QuicConfigValue {
|
| public:
|
| QuicFixedUint32(QuicTag name, QuicConfigPresence presence);
|
| - virtual ~QuicFixedUint32();
|
| + ~QuicFixedUint32() override;
|
|
|
| bool HasSendValue() const;
|
|
|
| @@ -166,13 +164,12 @@ class NET_EXPORT_PRIVATE QuicFixedUint32 : public QuicConfigValue {
|
| void SetReceivedValue(uint32 value);
|
|
|
| // If has_send_value is true, serialises |tag_| and |send_value_| to |out|.
|
| - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
| + void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
|
|
| // Sets |value_| to the corresponding value from |peer_hello_| if it exists.
|
| - virtual QuicErrorCode ProcessPeerHello(
|
| - const CryptoHandshakeMessage& peer_hello,
|
| - HelloType hello_type,
|
| - std::string* error_details) override;
|
| + QuicErrorCode ProcessPeerHello(const CryptoHandshakeMessage& peer_hello,
|
| + HelloType hello_type,
|
| + std::string* error_details) override;
|
|
|
| private:
|
| uint32 send_value_;
|
| @@ -185,7 +182,7 @@ class NET_EXPORT_PRIVATE QuicFixedUint32 : public QuicConfigValue {
|
| class NET_EXPORT_PRIVATE QuicFixedTag : public QuicConfigValue {
|
| public:
|
| QuicFixedTag(QuicTag name, QuicConfigPresence presence);
|
| - virtual ~QuicFixedTag();
|
| + ~QuicFixedTag() override;
|
|
|
| bool HasSendValue() const;
|
|
|
| @@ -200,13 +197,12 @@ class NET_EXPORT_PRIVATE QuicFixedTag : public QuicConfigValue {
|
| void SetReceivedValue(QuicTag value);
|
|
|
| // If has_send_value is true, serialises |tag_| and |send_value_| to |out|.
|
| - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
| + void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
|
|
| // Sets |value_| to the corresponding value from |client_hello_| if it exists.
|
| - virtual QuicErrorCode ProcessPeerHello(
|
| - const CryptoHandshakeMessage& peer_hello,
|
| - HelloType hello_type,
|
| - std::string* error_details) override;
|
| + QuicErrorCode ProcessPeerHello(const CryptoHandshakeMessage& peer_hello,
|
| + HelloType hello_type,
|
| + std::string* error_details) override;
|
|
|
| private:
|
| QuicTag send_value_;
|
| @@ -219,7 +215,7 @@ class NET_EXPORT_PRIVATE QuicFixedTag : public QuicConfigValue {
|
| class NET_EXPORT_PRIVATE QuicFixedTagVector : public QuicConfigValue {
|
| public:
|
| QuicFixedTagVector(QuicTag name, QuicConfigPresence presence);
|
| - virtual ~QuicFixedTagVector();
|
| + ~QuicFixedTagVector() override;
|
|
|
| bool HasSendValues() const;
|
|
|
| @@ -235,14 +231,13 @@ class NET_EXPORT_PRIVATE QuicFixedTagVector : public QuicConfigValue {
|
|
|
| // If has_send_value is true, serialises |tag_vector_| and |send_value_| to
|
| // |out|.
|
| - virtual void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
| + void ToHandshakeMessage(CryptoHandshakeMessage* out) const override;
|
|
|
| // Sets |receive_values_| to the corresponding value from |client_hello_| if
|
| // it exists.
|
| - virtual QuicErrorCode ProcessPeerHello(
|
| - const CryptoHandshakeMessage& peer_hello,
|
| - HelloType hello_type,
|
| - std::string* error_details) override;
|
| + QuicErrorCode ProcessPeerHello(const CryptoHandshakeMessage& peer_hello,
|
| + HelloType hello_type,
|
| + std::string* error_details) override;
|
|
|
| private:
|
| QuicTagVector send_values_;
|
|
|