commit c48c871a41b3155b544abac5ce0d70691800a3b1
author vasilvv <vasilvv@google.com> Mon Mar 11 13:38:16 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 11 13:38:47 2019 -0700
tree 86edd4f8e47d8e9c1d862efac09aa6b46d01037a
parent 348de99ee1f13e6747da3695387a2c78610f5f62

Replace QuicString with std::string, pass 1

This replaces QuicString with std::string in all of the "QUIC proper".  I will
delete QuicString once all code using it is gone.

gfe-relnote: n/a (no functional change)
PiperOrigin-RevId: 237872023
Change-Id: I82de62c9855516b15039734d05155917e68ff4ee

quic/core/quic_crypto_server_handshaker.cc

diff --git a/quic/core/quic_crypto_server_handshaker.cc b/quic/core/quic_crypto_server_handshaker.cc
index 66f3e12..fb24fed 100644
--- a/quic/core/quic_crypto_server_handshaker.cc
+++ b/quic/core/quic_crypto_server_handshaker.cc
@@ -24,7 +24,7 @@
 
   void Run(
       QuicErrorCode error,
-      const QuicString& error_details,
+      const std::string& error_details,
       std::unique_ptr<CryptoHandshakeMessage> message,
       std::unique_ptr<DiversificationNonce> diversification_nonce,
       std::unique_ptr<ProofSource::Details> proof_source_details) override {
@@ -160,7 +160,7 @@
     FinishProcessingHandshakeMessageAfterProcessClientHello(
         const ValidateClientHelloResultCallback::Result& result,
         QuicErrorCode error,
-        const QuicString& error_details,
+        const std::string& error_details,
         std::unique_ptr<CryptoHandshakeMessage> reply,
         std::unique_ptr<DiversificationNonce> diversification_nonce,
         std::unique_ptr<ProofSource::Details> proof_source_details) {
@@ -207,7 +207,7 @@
   // session config.
   QuicConfig* config = session()->config();
   OverrideQuicConfigDefaults(config);
-  QuicString process_error_details;
+  std::string process_error_details;
   const QuicErrorCode process_error =
       config->ProcessPeerHello(message, CLIENT, &process_error_details);
   if (process_error != QUIC_NO_ERROR) {
@@ -354,13 +354,13 @@
 }
 
 bool QuicCryptoServerHandshaker::GetBase64SHA256ClientChannelID(
-    QuicString* output) const {
+    std::string* output) const {
   if (!encryption_established() ||
       crypto_negotiated_params_->channel_id.empty()) {
     return false;
   }
 
-  const QuicString& channel_id(crypto_negotiated_params_->channel_id);
+  const std::string& channel_id(crypto_negotiated_params_->channel_id);
   uint8_t digest[SHA256_DIGEST_LENGTH];
   SHA256(reinterpret_cast<const uint8_t*>(channel_id.data()), channel_id.size(),
          digest);
@@ -392,7 +392,7 @@
     std::unique_ptr<ProofSource::Details> proof_source_details,
     std::unique_ptr<ProcessClientHelloResultCallback> done_cb) {
   const CryptoHandshakeMessage& message = result->client_hello;
-  QuicString error_details;
+  std::string error_details;
   if (!helper_->CanAcceptClientHello(
           message, GetClientAddress(), session()->connection()->peer_address(),
           session()->connection()->self_address(), &error_details)) {