| Index: net/quic/quic_crypto_client_stream.cc
|
| diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
|
| index 1c41e0a6e08ca352d3ca06dfe9098820e843997b..45c807830b1be93065991019866e8300991fa2e1 100644
|
| --- a/net/quic/quic_crypto_client_stream.cc
|
| +++ b/net/quic/quic_crypto_client_stream.cc
|
| @@ -49,7 +49,7 @@ QuicCryptoClientStream::ProofVerifierCallbackImpl::
|
|
|
| void QuicCryptoClientStream::ProofVerifierCallbackImpl::Run(
|
| bool ok,
|
| - const string& error_details,
|
| + const std::string& error_details,
|
| scoped_ptr<ProofVerifyDetails>* details) {
|
| if (stream_ == nullptr) {
|
| return;
|
| @@ -141,7 +141,7 @@ bool QuicCryptoClientStream::WasChannelIDSourceCallbackRun() const {
|
| void QuicCryptoClientStream::HandleServerConfigUpdateMessage(
|
| const CryptoHandshakeMessage& server_config_update) {
|
| DCHECK(server_config_update.tag() == kSCUP);
|
| - string error_details;
|
| + std::string error_details;
|
| QuicCryptoClientConfig::CachedState* cached =
|
| crypto_config_->LookupOrCreate(server_id_);
|
| QuicErrorCode error = crypto_config_->ProcessServerConfigUpdate(
|
| @@ -277,7 +277,7 @@ void QuicCryptoClientStream::DoSendCHLO(
|
| }
|
|
|
| session()->config()->ToHandshakeMessage(&out);
|
| - string error_details;
|
| + std::string error_details;
|
| QuicErrorCode error = crypto_config_->FillClientHello(
|
| server_id_,
|
| session()->connection()->connection_id(),
|
| @@ -338,7 +338,7 @@ void QuicCryptoClientStream::DoReceiveREJ(
|
| "Expected REJ");
|
| return;
|
| }
|
| - string error_details;
|
| + std::string error_details;
|
| QuicErrorCode error = crypto_config_->ProcessRejection(
|
| *in, session()->connection()->clock()->WallNow(), cached,
|
| server_id_.is_https(), &crypto_negotiated_params_, &error_details);
|
| @@ -509,7 +509,7 @@ void QuicCryptoClientStream::DoReceiveSHLO(
|
| return;
|
| }
|
|
|
| - string error_details;
|
| + std::string error_details;
|
| QuicErrorCode error = crypto_config_->ProcessServerHello(
|
| *in, session()->connection()->connection_id(),
|
| session()->connection()->server_supported_versions(),
|
|
|