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/test_tools/quic_crypto_server_config_peer.cc

diff --git a/quic/test_tools/quic_crypto_server_config_peer.cc b/quic/test_tools/quic_crypto_server_config_peer.cc
index 048e6bb..be2d338 100644
--- a/quic/test_tools/quic_crypto_server_config_peer.cc
+++ b/quic/test_tools/quic_crypto_server_config_peer.cc
@@ -19,7 +19,7 @@
 }
 
 QuicReferenceCountedPointer<QuicCryptoServerConfig::Config>
-QuicCryptoServerConfigPeer::GetConfig(QuicString config_id) {
+QuicCryptoServerConfigPeer::GetConfig(std::string config_id) {
   QuicReaderMutexLock locked(&server_config_->configs_lock_);
   if (config_id == "<primary>") {
     return QuicReferenceCountedPointer<QuicCryptoServerConfig::Config>(
@@ -38,8 +38,8 @@
   server_config_->proof_source_ = std::move(proof_source);
 }
 
-QuicString QuicCryptoServerConfigPeer::NewSourceAddressToken(
-    QuicString config_id,
+std::string QuicCryptoServerConfigPeer::NewSourceAddressToken(
+    std::string config_id,
     SourceAddressTokens previous_tokens,
     const QuicIpAddress& ip,
     QuicRandom* rand,
@@ -51,7 +51,7 @@
 }
 
 HandshakeFailureReason QuicCryptoServerConfigPeer::ValidateSourceAddressTokens(
-    QuicString config_id,
+    std::string config_id,
     QuicStringPiece srct,
     const QuicIpAddress& ip,
     QuicWallTime now,
@@ -84,7 +84,7 @@
 }
 
 void QuicCryptoServerConfigPeer::CheckConfigs(
-    std::vector<std::pair<QuicString, bool>> expected_ids_and_status) {
+    std::vector<std::pair<std::string, bool>> expected_ids_and_status) {
   QuicReaderMutexLock locked(&server_config_->configs_lock_);
 
   ASSERT_EQ(expected_ids_and_status.size(), server_config_->configs_.size())
@@ -109,14 +109,14 @@
   }
 }
 
-// ConfigsDebug returns a QuicString that contains debugging information about
+// ConfigsDebug returns a std::string that contains debugging information about
 // the set of Configs loaded in |server_config_| and their status.
-QuicString QuicCryptoServerConfigPeer::ConfigsDebug() {
+std::string QuicCryptoServerConfigPeer::ConfigsDebug() {
   if (server_config_->configs_.empty()) {
     return "No Configs in QuicCryptoServerConfig";
   }
 
-  QuicString s;
+  std::string s;
 
   for (const auto& i : server_config_->configs_) {
     const QuicReferenceCountedPointer<QuicCryptoServerConfig::Config> config =
@@ -139,11 +139,11 @@
       QuicWallTime::FromUNIXSeconds(seconds));
 }
 
-QuicString QuicCryptoServerConfigPeer::CompressChain(
+std::string QuicCryptoServerConfigPeer::CompressChain(
     QuicCompressedCertsCache* compressed_certs_cache,
     const QuicReferenceCountedPointer<ProofSource::Chain>& chain,
-    const QuicString& client_common_set_hashes,
-    const QuicString& client_cached_cert_hashes,
+    const std::string& client_common_set_hashes,
+    const std::string& client_cached_cert_hashes,
     const CommonCertSets* common_sets) {
   return QuicCryptoServerConfig::CompressChain(
       compressed_certs_cache, chain, client_common_set_hashes,