commit d5d13c2a81b5b504c1bf3308b12c5479a1eb8d58
author rch <rch@google.com> Mon Mar 18 14:31:09 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Mar 18 14:31:55 2019 -0700
tree d448b85291d48020df4053134a6103a57404eda4
parent 4dae841a8226ff528b3646a64f6d76e988e4c625

Use std::string instead of string in a few places in QUIC to permit chrome merge.

gfe-relnote: n/a - just adding std:: prefix.
PiperOrigin-RevId: 239062252
Change-Id: I7351ad10d7445eb2c9dd1fc7a6bb5e91c09273a9

quic/core/crypto/crypto_utils.cc

diff --git a/quic/core/crypto/crypto_utils.cc b/quic/core/crypto/crypto_utils.cc
index e3e438b..7580bbb 100644
--- a/quic/core/crypto/crypto_utils.cc
+++ b/quic/core/crypto/crypto_utils.cc
@@ -458,7 +458,7 @@
 std::string CryptoUtils::HashHandshakeMessage(
     const CryptoHandshakeMessage& message,
     Perspective perspective) {
-  string output;
+  std::string output;
   const QuicData& serialized = message.GetSerialized();
   uint8_t digest[SHA256_DIGEST_LENGTH];
   SHA256(reinterpret_cast<const uint8_t*>(serialized.data()),

quic/core/crypto/crypto_utils.h

diff --git a/quic/core/crypto/crypto_utils.h b/quic/core/crypto/crypto_utils.h
index a958311..b881778 100644
--- a/quic/core/crypto/crypto_utils.h
+++ b/quic/core/crypto/crypto_utils.h
@@ -198,8 +198,8 @@
       HandshakeFailureReason reason);
 
   // Returns a hash of the serialized |message|.
-  static string HashHandshakeMessage(const CryptoHandshakeMessage& message,
-                                     Perspective perspective);
+  static std::string HashHandshakeMessage(const CryptoHandshakeMessage& message,
+                                          Perspective perspective);
 
  private:
   // Implements the HKDF-Expand-Label function as defined in section 7.1 of RFC