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_fakes.h

diff --git a/quic/quartc/quartc_fakes.h b/quic/quartc/quartc_fakes.h
index 16ff9c7..1719065 100644
--- a/quic/quartc/quartc_fakes.h
+++ b/quic/quartc/quartc_fakes.h
@@ -29,7 +29,7 @@
   }
 
   void OnConnectError(QuicErrorCode error,
-                      const QuicString& error_details) override {
+                      const std::string& error_details) override {
     LOG(FATAL) << "Unexpected error during QuartcEndpoint::Connect(); error="
                << error << ", error_details=" << error_details;
   }
@@ -62,7 +62,7 @@
 
   // Called when connection closes locally, or remotely by peer.
   void OnConnectionClosed(QuicErrorCode error_code,
-                          const QuicString& error_details,
+                          const std::string& error_details,
                           ConnectionCloseSource source) override {
     connected_ = false;
   }
@@ -84,7 +84,7 @@
   QuartcStream* last_incoming_stream() { return last_incoming_stream_; }
 
   // Returns all received messages.
-  const std::vector<QuicString>& incoming_messages() {
+  const std::vector<std::string>& incoming_messages() {
     return incoming_messages_;
   }
 
@@ -94,7 +94,7 @@
 
  private:
   QuartcStream* last_incoming_stream_;
-  std::vector<QuicString> incoming_messages_;
+  std::vector<std::string> incoming_messages_;
   bool connected_ = true;
   QuartcStream::Delegate* stream_delegate_;
   QuicTime writable_time_ = QuicTime::Zero();
@@ -110,8 +110,8 @@
                     bool fin) override {
     size_t bytes_consumed = 0;
     for (size_t i = 0; i < iov_length; ++i) {
-      received_data_[stream->id()] +=
-          QuicString(static_cast<const char*>(iov[i].iov_base), iov[i].iov_len);
+      received_data_[stream->id()] += std::string(
+          static_cast<const char*>(iov[i].iov_base), iov[i].iov_len);
       bytes_consumed += iov[i].iov_len;
     }
     return bytes_consumed;
@@ -124,12 +124,12 @@
   void OnBufferChanged(QuartcStream* stream) override {}
 
   bool has_data() { return !received_data_.empty(); }
-  std::map<QuicStreamId, QuicString> data() { return received_data_; }
+  std::map<QuicStreamId, std::string> data() { return received_data_; }
 
   QuicRstStreamErrorCode stream_error(QuicStreamId id) { return errors_[id]; }
 
  private:
-  std::map<QuicStreamId, QuicString> received_data_;
+  std::map<QuicStreamId, std::string> received_data_;
   std::map<QuicStreamId, QuicRstStreamErrorCode> errors_;
 };