Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Unified Diff: net/quic/quic_crypto_server_stream.cc

Issue 763833003: Remove using namespace in net/quic/quic_stream_sequencer.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/quic/quic_crypto_server_stream.cc
diff --git a/net/quic/quic_crypto_server_stream.cc b/net/quic/quic_crypto_server_stream.cc
index c4b58938b332d5df7129fa9f623699eff65b1ab0..43c5892e45ea95972cefcf401325cadf96c5b51d 100644
--- a/net/quic/quic_crypto_server_stream.cc
+++ b/net/quic/quic_crypto_server_stream.cc
@@ -85,7 +85,7 @@ void QuicCryptoServerStream::FinishProcessingHandshakeMessage(
DCHECK(validate_client_hello_cb_ != nullptr);
validate_client_hello_cb_ = nullptr;
- string error_details;
+ std::string error_details;
CryptoHandshakeMessage reply;
QuicErrorCode error = ProcessClientHello(
message, result, &reply, &error_details);
@@ -175,7 +175,7 @@ void QuicCryptoServerStream::SendServerConfigUpdate(
DVLOG(1) << "Server: Sending server config update: "
<< server_config_update_message.DebugString();
const QuicData& data = server_config_update_message.GetSerialized();
- WriteOrBufferData(string(data.data(), data.length()), false, nullptr);
+ WriteOrBufferData(std::string(data.data(), data.length()), false, nullptr);
++num_server_config_update_messages_sent_;
}
@@ -191,20 +191,20 @@ void QuicCryptoServerStream::set_previous_cached_network_params(
}
bool QuicCryptoServerStream::GetBase64SHA256ClientChannelID(
- string* output) const {
+ std::string* output) const {
if (!encryption_established_ ||
crypto_negotiated_params_.channel_id.empty()) {
return false;
}
- const string& channel_id(crypto_negotiated_params_.channel_id);
+ const std::string& channel_id(crypto_negotiated_params_.channel_id);
scoped_ptr<crypto::SecureHash> hash(
crypto::SecureHash::Create(crypto::SecureHash::SHA256));
hash->Update(channel_id.data(), channel_id.size());
uint8 digest[32];
hash->Finish(digest, sizeof(digest));
- base::Base64Encode(string(
+ base::Base64Encode(std::string(
reinterpret_cast<const char*>(digest), sizeof(digest)), output);
// Remove padding.
size_t len = output->size();
@@ -224,7 +224,7 @@ QuicErrorCode QuicCryptoServerStream::ProcessClientHello(
const CryptoHandshakeMessage& message,
const ValidateClientHelloResultCallback::Result& result,
CryptoHandshakeMessage* reply,
- string* error_details) {
+ std::string* error_details) {
// Store the bandwidth estimate from the client.
if (result.cached_network_params.bandwidth_estimate_bytes_per_second() > 0) {
previous_cached_network_params_.reset(

Powered by Google App Engine
This is Rietveld 408576698