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/quartc/quartc_crypto_helpers.cc

diff --git a/quic/quartc/quartc_crypto_helpers.cc b/quic/quartc/quartc_crypto_helpers.cc
index 865fec4..93023e7 100644
--- a/quic/quartc/quartc_crypto_helpers.cc
+++ b/quic/quartc/quartc_crypto_helpers.cc
@@ -10,8 +10,8 @@
 namespace quic {
 
 void DummyProofSource::GetProof(const QuicSocketAddress& server_address,
-                                const QuicString& hostname,
-                                const QuicString& server_config,
+                                const std::string& hostname,
+                                const std::string& server_config,
                                 QuicTransportVersion transport_version,
                                 QuicStringPiece chlo_hash,
                                 std::unique_ptr<Callback> callback) {
@@ -25,8 +25,8 @@
 
 QuicReferenceCountedPointer<DummyProofSource::Chain>
 DummyProofSource::GetCertChain(const QuicSocketAddress& server_address,
-                               const QuicString& hostname) {
-  std::vector<QuicString> certs;
+                               const std::string& hostname) {
+  std::vector<std::string> certs;
   certs.push_back(kDummyCertName);
   return QuicReferenceCountedPointer<ProofSource::Chain>(
       new ProofSource::Chain(certs));
@@ -34,7 +34,7 @@
 
 void DummyProofSource::ComputeTlsSignature(
     const QuicSocketAddress& server_address,
-    const QuicString& hostname,
+    const std::string& hostname,
     uint16_t signature_algorithm,
     QuicStringPiece in,
     std::unique_ptr<SignatureCallback> callback) {
@@ -42,26 +42,26 @@
 }
 
 QuicAsyncStatus InsecureProofVerifier::VerifyProof(
-    const QuicString& hostname,
+    const std::string& hostname,
     const uint16_t port,
-    const QuicString& server_config,
+    const std::string& server_config,
     QuicTransportVersion transport_version,
     QuicStringPiece chlo_hash,
-    const std::vector<QuicString>& certs,
-    const QuicString& cert_sct,
-    const QuicString& signature,
+    const std::vector<std::string>& certs,
+    const std::string& cert_sct,
+    const std::string& signature,
     const ProofVerifyContext* context,
-    QuicString* error_details,
+    std::string* error_details,
     std::unique_ptr<ProofVerifyDetails>* verify_details,
     std::unique_ptr<ProofVerifierCallback> callback) {
   return QUIC_SUCCESS;
 }
 
 QuicAsyncStatus InsecureProofVerifier::VerifyCertChain(
-    const QuicString& hostname,
-    const std::vector<QuicString>& certs,
+    const std::string& hostname,
+    const std::vector<std::string>& certs,
     const ProofVerifyContext* context,
-    QuicString* error_details,
+    std::string* error_details,
     std::unique_ptr<ProofVerifyDetails>* details,
     std::unique_ptr<ProofVerifierCallback> callback) {
   return QUIC_SUCCESS;
@@ -86,7 +86,7 @@
     const QuicSocketAddress& client_address,
     const QuicSocketAddress& peer_address,
     const QuicSocketAddress& self_address,
-    QuicString* error_details) const {
+    std::string* error_details) const {
   return true;
 }
 
@@ -114,7 +114,7 @@
   char source_address_token_secret[kInputKeyingMaterialLength];
   random->RandBytes(source_address_token_secret, kInputKeyingMaterialLength);
   auto config = QuicMakeUnique<QuicCryptoServerConfig>(
-      QuicString(source_address_token_secret, kInputKeyingMaterialLength),
+      std::string(source_address_token_secret, kInputKeyingMaterialLength),
       random, QuicMakeUnique<DummyProofSource>(), KeyExchangeSource::Default(),
       TlsServerHandshaker::CreateSslCtx());
 
@@ -155,7 +155,7 @@
   const QuicData& data = message->GetSerialized();
 
   crypto_server_config.serialized_crypto_config =
-      QuicString(data.data(), data.length());
+      std::string(data.data(), data.length());
   return crypto_server_config;
 }