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
diff --git a/quic/core/frames/quic_application_close_frame.h b/quic/core/frames/quic_application_close_frame.h
index b9b84dd..6a85265 100644
--- a/quic/core/frames/quic_application_close_frame.h
+++ b/quic/core/frames/quic_application_close_frame.h
@@ -21,7 +21,7 @@
const QuicApplicationCloseFrame& frame);
QuicErrorCode error_code;
- QuicString error_details;
+ std::string error_details;
};
} // namespace quic
diff --git a/quic/core/frames/quic_connection_close_frame.cc b/quic/core/frames/quic_connection_close_frame.cc
index 51969c6..55d356b 100644
--- a/quic/core/frames/quic_connection_close_frame.cc
+++ b/quic/core/frames/quic_connection_close_frame.cc
@@ -10,14 +10,14 @@
: error_code(QUIC_NO_ERROR), frame_type(0) {}
QuicConnectionCloseFrame::QuicConnectionCloseFrame(QuicErrorCode error_code,
- QuicString error_details)
+ std::string error_details)
: error_code(error_code),
error_details(std::move(error_details)),
frame_type(0) {}
QuicConnectionCloseFrame::QuicConnectionCloseFrame(
QuicIetfTransportErrorCodes ietf_error_code,
- QuicString error_details,
+ std::string error_details,
uint64_t frame_type)
: ietf_error_code(ietf_error_code),
error_details(std::move(error_details)),
diff --git a/quic/core/frames/quic_connection_close_frame.h b/quic/core/frames/quic_connection_close_frame.h
index 2bbbe73..1b909ce 100644
--- a/quic/core/frames/quic_connection_close_frame.h
+++ b/quic/core/frames/quic_connection_close_frame.h
@@ -16,9 +16,9 @@
struct QUIC_EXPORT_PRIVATE QuicConnectionCloseFrame {
QuicConnectionCloseFrame();
- QuicConnectionCloseFrame(QuicErrorCode error_code, QuicString error_details);
+ QuicConnectionCloseFrame(QuicErrorCode error_code, std::string error_details);
QuicConnectionCloseFrame(QuicIetfTransportErrorCodes ietf_error_code,
- QuicString error_details,
+ std::string error_details,
uint64_t frame_type);
friend QUIC_EXPORT_PRIVATE std::ostream& operator<<(
@@ -33,7 +33,7 @@
QuicErrorCode error_code;
QuicIetfTransportErrorCodes ietf_error_code;
};
- QuicString error_details;
+ std::string error_details;
// Contains the type of frame that triggered the connection close. Made a
// uint64, as opposed to the QuicIetfFrameType, to support possible
diff --git a/quic/core/frames/quic_goaway_frame.cc b/quic/core/frames/quic_goaway_frame.cc
index ff034f0..53dca54 100644
--- a/quic/core/frames/quic_goaway_frame.cc
+++ b/quic/core/frames/quic_goaway_frame.cc
@@ -16,7 +16,7 @@
QuicGoAwayFrame::QuicGoAwayFrame(QuicControlFrameId control_frame_id,
QuicErrorCode error_code,
QuicStreamId last_good_stream_id,
- const QuicString& reason)
+ const std::string& reason)
: control_frame_id(control_frame_id),
error_code(error_code),
last_good_stream_id(last_good_stream_id),
diff --git a/quic/core/frames/quic_goaway_frame.h b/quic/core/frames/quic_goaway_frame.h
index 085e915..03d6273 100644
--- a/quic/core/frames/quic_goaway_frame.h
+++ b/quic/core/frames/quic_goaway_frame.h
@@ -18,7 +18,7 @@
QuicGoAwayFrame(QuicControlFrameId control_frame_id,
QuicErrorCode error_code,
QuicStreamId last_good_stream_id,
- const QuicString& reason);
+ const std::string& reason);
friend QUIC_EXPORT_PRIVATE std::ostream& operator<<(std::ostream& os,
const QuicGoAwayFrame& g);
@@ -28,7 +28,7 @@
QuicControlFrameId control_frame_id;
QuicErrorCode error_code;
QuicStreamId last_good_stream_id;
- QuicString reason_phrase;
+ std::string reason_phrase;
};
} // namespace quic
diff --git a/quic/core/frames/quic_new_token_frame.cc b/quic/core/frames/quic_new_token_frame.cc
index c2f4e74..6e36866 100644
--- a/quic/core/frames/quic_new_token_frame.cc
+++ b/quic/core/frames/quic_new_token_frame.cc
@@ -12,7 +12,7 @@
: control_frame_id(kInvalidControlFrameId) {}
QuicNewTokenFrame::QuicNewTokenFrame(QuicControlFrameId control_frame_id,
- QuicString token)
+ std::string token)
: control_frame_id(control_frame_id), token(token) {}
std::ostream& operator<<(std::ostream& os, const QuicNewTokenFrame& s) {
diff --git a/quic/core/frames/quic_new_token_frame.h b/quic/core/frames/quic_new_token_frame.h
index 6fb0ea4..5a063a3 100644
--- a/quic/core/frames/quic_new_token_frame.h
+++ b/quic/core/frames/quic_new_token_frame.h
@@ -17,7 +17,7 @@
struct QUIC_EXPORT_PRIVATE QuicNewTokenFrame {
QuicNewTokenFrame();
- QuicNewTokenFrame(QuicControlFrameId control_frame_id, QuicString token);
+ QuicNewTokenFrame(QuicControlFrameId control_frame_id, std::string token);
friend QUIC_EXPORT_PRIVATE std::ostream& operator<<(
std::ostream& os,
@@ -27,7 +27,7 @@
// and non-zero when sent.
QuicControlFrameId control_frame_id;
- QuicString token;
+ std::string token;
};
static_assert(sizeof(QuicNewTokenFrame) <= 64,
"Keep the QuicNewTokenFrame size to a cacheline.");
