| Index: net/quic/core/quic_config.cc
|
| diff --git a/net/quic/core/quic_config.cc b/net/quic/core/quic_config.cc
|
| index 784add587329a3858d5828bf338fdbe4d4d00a0c..0c5b5f9bf17eab00b62d4b4e207dec88b76f4c38 100644
|
| --- a/net/quic/core/quic_config.cc
|
| +++ b/net/quic/core/quic_config.cc
|
| @@ -32,7 +32,7 @@ QuicErrorCode ReadUint32(const CryptoHandshakeMessage& msg,
|
| switch (error) {
|
| case QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND:
|
| if (presence == PRESENCE_REQUIRED) {
|
| - *error_details = "Missing " + QuicUtils::TagToString(tag);
|
| + *error_details = "Missing " + QuicTagToString(tag);
|
| break;
|
| }
|
| error = QUIC_NO_ERROR;
|
| @@ -41,7 +41,7 @@ QuicErrorCode ReadUint32(const CryptoHandshakeMessage& msg,
|
| case QUIC_NO_ERROR:
|
| break;
|
| default:
|
| - *error_details = "Bad " + QuicUtils::TagToString(tag);
|
| + *error_details = "Bad " + QuicTagToString(tag);
|
| break;
|
| }
|
| return error;
|
| @@ -104,8 +104,7 @@ QuicErrorCode QuicNegotiableUint32::ProcessPeerHello(
|
| return error;
|
| }
|
| if (hello_type == SERVER && value > max_value_) {
|
| - *error_details =
|
| - "Invalid value received for " + QuicUtils::TagToString(tag_);
|
| + *error_details = "Invalid value received for " + QuicTagToString(tag_);
|
| return QUIC_INVALID_NEGOTIATED_VALUE;
|
| }
|
|
|
| @@ -126,7 +125,7 @@ bool QuicFixedUint32::HasSendValue() const {
|
|
|
| uint32_t QuicFixedUint32::GetSendValue() const {
|
| QUIC_BUG_IF(!has_send_value_) << "No send value to get for tag:"
|
| - << QuicUtils::TagToString(tag_);
|
| + << QuicTagToString(tag_);
|
| return send_value_;
|
| }
|
|
|
| @@ -141,7 +140,7 @@ bool QuicFixedUint32::HasReceivedValue() const {
|
|
|
| uint32_t QuicFixedUint32::GetReceivedValue() const {
|
| QUIC_BUG_IF(!has_receive_value_) << "No receive value to get for tag:"
|
| - << QuicUtils::TagToString(tag_);
|
| + << QuicTagToString(tag_);
|
| return receive_value_;
|
| }
|
|
|
| @@ -167,13 +166,13 @@ QuicErrorCode QuicFixedUint32::ProcessPeerHello(
|
| if (presence_ == PRESENCE_OPTIONAL) {
|
| return QUIC_NO_ERROR;
|
| }
|
| - *error_details = "Missing " + QuicUtils::TagToString(tag_);
|
| + *error_details = "Missing " + QuicTagToString(tag_);
|
| break;
|
| case QUIC_NO_ERROR:
|
| has_receive_value_ = true;
|
| break;
|
| default:
|
| - *error_details = "Bad " + QuicUtils::TagToString(tag_);
|
| + *error_details = "Bad " + QuicTagToString(tag_);
|
| break;
|
| }
|
| return error;
|
| @@ -196,7 +195,7 @@ bool QuicFixedTagVector::HasSendValues() const {
|
|
|
| QuicTagVector QuicFixedTagVector::GetSendValues() const {
|
| QUIC_BUG_IF(!has_send_values_) << "No send values to get for tag:"
|
| - << QuicUtils::TagToString(tag_);
|
| + << QuicTagToString(tag_);
|
| return send_values_;
|
| }
|
|
|
| @@ -211,7 +210,7 @@ bool QuicFixedTagVector::HasReceivedValues() const {
|
|
|
| QuicTagVector QuicFixedTagVector::GetReceivedValues() const {
|
| QUIC_BUG_IF(!has_receive_values_) << "No receive value to get for tag:"
|
| - << QuicUtils::TagToString(tag_);
|
| + << QuicTagToString(tag_);
|
| return receive_values_;
|
| }
|
|
|
| @@ -240,7 +239,7 @@ QuicErrorCode QuicFixedTagVector::ProcessPeerHello(
|
| if (presence_ == PRESENCE_OPTIONAL) {
|
| return QUIC_NO_ERROR;
|
| }
|
| - *error_details = "Missing " + QuicUtils::TagToString(tag_);
|
| + *error_details = "Missing " + QuicTagToString(tag_);
|
| break;
|
| case QUIC_NO_ERROR:
|
| DVLOG(1) << "Received Connection Option tags from receiver.";
|
| @@ -250,7 +249,7 @@ QuicErrorCode QuicFixedTagVector::ProcessPeerHello(
|
| }
|
| break;
|
| default:
|
| - *error_details = "Bad " + QuicUtils::TagToString(tag_);
|
| + *error_details = "Bad " + QuicTagToString(tag_);
|
| break;
|
| }
|
| return error;
|
| @@ -270,7 +269,7 @@ bool QuicFixedIPEndPoint::HasSendValue() const {
|
|
|
| const IPEndPoint& QuicFixedIPEndPoint::GetSendValue() const {
|
| QUIC_BUG_IF(!has_send_value_) << "No send value to get for tag:"
|
| - << QuicUtils::TagToString(tag_);
|
| + << QuicTagToString(tag_);
|
| return send_value_;
|
| }
|
|
|
| @@ -285,7 +284,7 @@ bool QuicFixedIPEndPoint::HasReceivedValue() const {
|
|
|
| const IPEndPoint& QuicFixedIPEndPoint::GetReceivedValue() const {
|
| QUIC_BUG_IF(!has_receive_value_) << "No receive value to get for tag:"
|
| - << QuicUtils::TagToString(tag_);
|
| + << QuicTagToString(tag_);
|
| return receive_value_;
|
| }
|
|
|
| @@ -309,7 +308,7 @@ QuicErrorCode QuicFixedIPEndPoint::ProcessPeerHello(
|
| base::StringPiece address;
|
| if (!peer_hello.GetStringPiece(tag_, &address)) {
|
| if (presence_ == PRESENCE_REQUIRED) {
|
| - *error_details = "Missing " + QuicUtils::TagToString(tag_);
|
| + *error_details = "Missing " + QuicTagToString(tag_);
|
| return QUIC_CRYPTO_MESSAGE_PARAMETER_NOT_FOUND;
|
| }
|
| } else {
|
|
|