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/crypto_test_utils.h

diff --git a/quic/test_tools/crypto_test_utils.h b/quic/test_tools/crypto_test_utils.h
index 8421895..0afb2aa 100644
--- a/quic/test_tools/crypto_test_utils.h
+++ b/quic/test_tools/crypto_test_utils.h
@@ -47,9 +47,9 @@
   // ChannelIDKey implementation.
 
   bool Sign(QuicStringPiece signed_data,
-            QuicString* out_signature) const override;
+            std::string* out_signature) const override;
 
-  QuicString SerializeKey() const override;
+  std::string SerializeKey() const override;
 
  private:
   bssl::UniquePtr<EVP_PKEY> ecdsa_key_;
@@ -62,12 +62,12 @@
   // ChannelIDSource implementation.
 
   QuicAsyncStatus GetChannelIDKey(
-      const QuicString& hostname,
+      const std::string& hostname,
       std::unique_ptr<ChannelIDKey>* channel_id_key,
       ChannelIDSourceCallback* /*callback*/) override;
 
  private:
-  static EVP_PKEY* HostnameToKey(const QuicString& hostname);
+  static EVP_PKEY* HostnameToKey(const std::string& hostname);
 };
 
 namespace crypto_test_utils {
@@ -176,7 +176,7 @@
                                            size_t server_i);
 
 // Returns the value for the tag |tag| in the tag value map of |message|.
-QuicString GetValueForTag(const CryptoHandshakeMessage& message, QuicTag tag);
+std::string GetValueForTag(const CryptoHandshakeMessage& message, QuicTag tag);
 
 // Returns a new |ProofSource| that serves up test certificates.
 std::unique_ptr<ProofSource> ProofSourceForTesting();
@@ -218,9 +218,9 @@
 //        {"SNI", "www.example.com"}},
 //       optional_minimum_size_bytes);
 CryptoHandshakeMessage CreateCHLO(
-    std::vector<std::pair<QuicString, QuicString>> tags_and_values);
+    std::vector<std::pair<std::string, std::string>> tags_and_values);
 CryptoHandshakeMessage CreateCHLO(
-    std::vector<std::pair<QuicString, QuicString>> tags_and_values,
+    std::vector<std::pair<std::string, std::string>> tags_and_values,
     int minimum_size_bytes);
 
 // ChannelIDSourceForTesting returns a ChannelIDSource that generates keys
@@ -262,11 +262,11 @@
                                 QuicCryptoServerStream* server);
 
 // Return a CHLO nonce in hexadecimal.
-QuicString GenerateClientNonceHex(const QuicClock* clock,
-                                  QuicCryptoServerConfig* crypto_config);
+std::string GenerateClientNonceHex(const QuicClock* clock,
+                                   QuicCryptoServerConfig* crypto_config);
 
 // Return a CHLO PUBS in hexadecimal.
-QuicString GenerateClientPublicValuesHex();
+std::string GenerateClientPublicValuesHex();
 
 }  // namespace crypto_test_utils