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/platform/api/quic_file_utils.cc b/quic/platform/api/quic_file_utils.cc
index 5492b83..29ec416 100644
--- a/quic/platform/api/quic_file_utils.cc
+++ b/quic/platform/api/quic_file_utils.cc
@@ -10,12 +10,12 @@
// Traverses the directory |dirname| and retuns all of the files
// it contains.
-std::vector<QuicString> ReadFileContents(const QuicString& dirname) {
+std::vector<std::string> ReadFileContents(const std::string& dirname) {
return ReadFileContentsImpl(dirname);
}
// Reads the contents of |filename| as a string into |contents|.
-void ReadFileContents(QuicStringPiece filename, QuicString* contents) {
+void ReadFileContents(QuicStringPiece filename, std::string* contents) {
ReadFileContentsImpl(filename, contents);
}
diff --git a/quic/platform/api/quic_file_utils.h b/quic/platform/api/quic_file_utils.h
index f010aa5..15eef0f 100644
--- a/quic/platform/api/quic_file_utils.h
+++ b/quic/platform/api/quic_file_utils.h
@@ -14,12 +14,12 @@
namespace quic {
// Traverses the directory |dirname| and returns all of the files it contains.
-QUIC_EXPORT_PRIVATE std::vector<QuicString> ReadFileContents(
- const QuicString& dirname);
+QUIC_EXPORT_PRIVATE std::vector<std::string> ReadFileContents(
+ const std::string& dirname);
// Reads the contents of |filename| as a string into |contents|.
QUIC_EXPORT_PRIVATE void ReadFileContents(QuicStringPiece filename,
- QuicString* contents);
+ std::string* contents);
} // namespace quic
diff --git a/quic/platform/api/quic_flags.h b/quic/platform/api/quic_flags.h
index 45145a7..50bf4db 100644
--- a/quic/platform/api/quic_flags.h
+++ b/quic/platform/api/quic_flags.h
@@ -31,7 +31,7 @@
// the command line specifies '-h' or '--help', prints a usage message with flag
// descriptions to stdout and exits with status 0. If a flag has an unparsable
// value, writes an error message to stderr and exits with status 1.
-inline std::vector<QuicString> QuicParseCommandLineFlags(
+inline std::vector<std::string> QuicParseCommandLineFlags(
const char* usage,
int argc,
const char* const* argv) {
diff --git a/quic/platform/api/quic_hostname_utils.cc b/quic/platform/api/quic_hostname_utils.cc
index d02529f..b7e4642 100644
--- a/quic/platform/api/quic_hostname_utils.cc
+++ b/quic/platform/api/quic_hostname_utils.cc
@@ -12,7 +12,7 @@
}
// static
-QuicString QuicHostnameUtils::NormalizeHostname(QuicStringPiece hostname) {
+std::string QuicHostnameUtils::NormalizeHostname(QuicStringPiece hostname) {
return QuicHostnameUtilsImpl::NormalizeHostname(hostname);
}
diff --git a/quic/platform/api/quic_hostname_utils.h b/quic/platform/api/quic_hostname_utils.h
index 7f2b98a..3b068ee 100644
--- a/quic/platform/api/quic_hostname_utils.h
+++ b/quic/platform/api/quic_hostname_utils.h
@@ -25,7 +25,7 @@
// Canonicalizes the specified hostname. This involves a wide variety of
// transformations, including lowercasing, removing trailing dots and IDNA
// conversion.
- static QuicString NormalizeHostname(QuicStringPiece hostname);
+ static std::string NormalizeHostname(QuicStringPiece hostname);
};
} // namespace quic
diff --git a/quic/platform/api/quic_hostname_utils_test.cc b/quic/platform/api/quic_hostname_utils_test.cc
index 8523384..8389f7d 100644
--- a/quic/platform/api/quic_hostname_utils_test.cc
+++ b/quic/platform/api/quic_hostname_utils_test.cc
@@ -78,7 +78,7 @@
// clang-format on
for (size_t i = 0; i < QUIC_ARRAYSIZE(tests); ++i) {
- EXPECT_EQ(QuicString(tests[i].expected),
+ EXPECT_EQ(std::string(tests[i].expected),
QuicHostnameUtils::NormalizeHostname(tests[i].input));
}
}
diff --git a/quic/platform/api/quic_ip_address.cc b/quic/platform/api/quic_ip_address.cc
index bf184dd..8710467 100644
--- a/quic/platform/api/quic_ip_address.cc
+++ b/quic/platform/api/quic_ip_address.cc
@@ -45,11 +45,11 @@
return impl_.AddressFamilyToInt();
}
-QuicString QuicIpAddress::ToPackedString() const {
+std::string QuicIpAddress::ToPackedString() const {
return impl_.ToPackedString();
}
-QuicString QuicIpAddress::ToString() const {
+std::string QuicIpAddress::ToString() const {
return impl_.ToString();
}
@@ -65,7 +65,7 @@
return impl_.FromPackedString(data, length);
}
-bool QuicIpAddress::FromString(QuicString str) {
+bool QuicIpAddress::FromString(std::string str) {
return impl_.FromString(str);
}
diff --git a/quic/platform/api/quic_ip_address.h b/quic/platform/api/quic_ip_address.h
index a8951df..33bd8fc 100644
--- a/quic/platform/api/quic_ip_address.h
+++ b/quic/platform/api/quic_ip_address.h
@@ -42,9 +42,9 @@
int AddressFamilyToInt() const;
// Returns the address as a sequence of bytes in network-byte-order. IPv4 will
// be 4 bytes. IPv6 will be 16 bytes.
- QuicString ToPackedString() const;
+ std::string ToPackedString() const;
// Returns string representation of the address.
- QuicString ToString() const;
+ std::string ToString() const;
// Normalizes the address representation with respect to IPv4 addresses, i.e,
// mapped IPv4 addresses ("::ffff:X.Y.Z.Q") are converted to pure IPv4
// addresses. All other IPv4, IPv6, and empty values are left unchanged.
@@ -56,7 +56,7 @@
// unchanged).
QuicIpAddress DualStacked() const;
bool FromPackedString(const char* data, size_t length);
- bool FromString(QuicString str);
+ bool FromString(std::string str);
bool IsIPv4() const;
bool IsIPv6() const;
bool InSameSubnet(const QuicIpAddress& other, int subnet_length);
diff --git a/quic/platform/api/quic_mem_slice_storage_test.cc b/quic/platform/api/quic_mem_slice_storage_test.cc
index 72623e1..d0c2588 100644
--- a/quic/platform/api/quic_mem_slice_storage_test.cc
+++ b/quic/platform/api/quic_mem_slice_storage_test.cc
@@ -22,7 +22,7 @@
TEST_F(QuicMemSliceStorageImplTest, SingleIov) {
SimpleBufferAllocator allocator;
- QuicString body(3, 'c');
+ std::string body(3, 'c');
struct iovec iov = {const_cast<char*>(body.data()), body.length()};
QuicMemSliceStorage storage(&iov, 1, &allocator, 1024);
auto span = storage.ToSpan();
@@ -32,8 +32,8 @@
TEST_F(QuicMemSliceStorageImplTest, MultipleIovInSingleSlice) {
SimpleBufferAllocator allocator;
- QuicString body1(3, 'a');
- QuicString body2(4, 'b');
+ std::string body1(3, 'a');
+ std::string body2(4, 'b');
struct iovec iov[] = {{const_cast<char*>(body1.data()), body1.length()},
{const_cast<char*>(body2.data()), body2.length()}};
@@ -44,8 +44,8 @@
TEST_F(QuicMemSliceStorageImplTest, MultipleIovInMultipleSlice) {
SimpleBufferAllocator allocator;
- QuicString body1(4, 'a');
- QuicString body2(4, 'b');
+ std::string body1(4, 'a');
+ std::string body2(4, 'b');
struct iovec iov[] = {{const_cast<char*>(body1.data()), body1.length()},
{const_cast<char*>(body2.data()), body2.length()}};
diff --git a/quic/platform/api/quic_socket_address.cc b/quic/platform/api/quic_socket_address.cc
index fd428e5..982ebf9 100644
--- a/quic/platform/api/quic_socket_address.cc
+++ b/quic/platform/api/quic_socket_address.cc
@@ -31,7 +31,7 @@
return impl_.IsInitialized();
}
-QuicString QuicSocketAddress::ToString() const {
+std::string QuicSocketAddress::ToString() const {
return impl_.ToString();
}
diff --git a/quic/platform/api/quic_socket_address.h b/quic/platform/api/quic_socket_address.h
index 297387f..21f29e4 100644
--- a/quic/platform/api/quic_socket_address.h
+++ b/quic/platform/api/quic_socket_address.h
@@ -31,7 +31,7 @@
const QuicSocketAddress& rhs);
bool IsInitialized() const;
- QuicString ToString() const;
+ std::string ToString() const;
int FromSocket(int fd);
QuicSocketAddress Normalized() const;
diff --git a/quic/platform/api/quic_stack_trace.h b/quic/platform/api/quic_stack_trace.h
index 1a1a10c..64411f0 100644
--- a/quic/platform/api/quic_stack_trace.h
+++ b/quic/platform/api/quic_stack_trace.h
@@ -10,7 +10,7 @@
namespace quic {
-inline QuicString QuicStackTrace() {
+inline std::string QuicStackTrace() {
return QuicStackTraceImpl();
}
diff --git a/quic/platform/api/quic_str_cat.h b/quic/platform/api/quic_str_cat.h
index 1720cfd..d5486db 100644
--- a/quic/platform/api/quic_str_cat.h
+++ b/quic/platform/api/quic_str_cat.h
@@ -14,12 +14,12 @@
// Merges given strings or numbers with no delimiter.
template <typename... Args>
-inline QuicString QuicStrCat(const Args&... args) {
+inline std::string QuicStrCat(const Args&... args) {
return QuicStrCatImpl(std::forward<const Args&>(args)...);
}
template <typename... Args>
-inline QuicString QuicStringPrintf(const Args&... args) {
+inline std::string QuicStringPrintf(const Args&... args) {
return QuicStringPrintfImpl(std::forward<const Args&>(args)...);
}
diff --git a/quic/platform/api/quic_str_cat_test.cc b/quic/platform/api/quic_str_cat_test.cc
index c8f1724..2930adf 100644
--- a/quic/platform/api/quic_str_cat_test.cc
+++ b/quic/platform/api/quic_str_cat_test.cc
@@ -25,7 +25,7 @@
const size_t size = 8;
const intptr_t intptr = -9;
const uintptr_t uintptr = 10;
- QuicString answer;
+ std::string answer;
answer = QuicStrCat(s, us);
EXPECT_EQ(answer, "-12");
answer = QuicStrCat(i, ui);
@@ -41,9 +41,9 @@
}
TEST_F(QuicStrCatTest, Basics) {
- QuicString result;
+ std::string result;
- QuicString strs[] = {"Hello", "Cruel", "World"};
+ std::string strs[] = {"Hello", "Cruel", "World"};
QuicStringPiece pieces[] = {"Hello", "Cruel", "World"};
@@ -82,7 +82,7 @@
result = QuicStrCat(ui64s[0], ", ", ui64s[1], "!");
EXPECT_EQ(result, "12345678910, 10987654321!");
- QuicString one = "1";
+ std::string one = "1";
result = QuicStrCat("And a ", one.size(), " and a ", &result[2] - &result[0],
" and a ", one, " 2 3 4", "!");
EXPECT_EQ(result, "And a 1 and a 2 and a 1 2 3 4!");
@@ -105,7 +105,7 @@
}
TEST_F(QuicStrCatTest, MaxArgs) {
- QuicString result;
+ std::string result;
// Test 10 up to 26 arguments, the current maximum
result = QuicStrCat(1, 2, 3, 4, 5, 6, 7, 8, 9, "a");
EXPECT_EQ(result, "123456789a");
diff --git a/quic/platform/api/quic_string_utils.h b/quic/platform/api/quic_string_utils.h
index ce54d61..76a101c 100644
--- a/quic/platform/api/quic_string_utils.h
+++ b/quic/platform/api/quic_string_utils.h
@@ -14,7 +14,7 @@
namespace quic {
template <typename... Args>
-inline void QuicStrAppend(QuicString* output, const Args&... args) {
+inline void QuicStrAppend(std::string* output, const Args&... args) {
QuicStrAppendImpl(output, std::forward<const Args&>(args)...);
}
diff --git a/quic/platform/api/quic_string_utils_test.cc b/quic/platform/api/quic_string_utils_test.cc
index 0d3567c..e2f1300 100644
--- a/quic/platform/api/quic_string_utils_test.cc
+++ b/quic/platform/api/quic_string_utils_test.cc
@@ -20,7 +20,7 @@
// Single string-like argument.
const char kFoo[] = "foo";
- const QuicString string_foo(kFoo);
+ const std::string string_foo(kFoo);
const QuicStringPiece stringpiece_foo(string_foo);
EXPECT_EQ("foo", QuicStrCat(kFoo));
EXPECT_EQ("foo", QuicStrCat(string_foo));
@@ -29,7 +29,7 @@
// Two string-like arguments.
const char kBar[] = "bar";
const QuicStringPiece stringpiece_bar(kBar);
- const QuicString string_bar(kBar);
+ const std::string string_bar(kBar);
EXPECT_EQ("foobar", QuicStrCat(kFoo, kBar));
EXPECT_EQ("foobar", QuicStrCat(kFoo, string_bar));
EXPECT_EQ("foobar", QuicStrCat(kFoo, stringpiece_bar));
@@ -73,13 +73,13 @@
TEST(QuicStringUtilsTest, QuicStrAppend) {
// No arguments on empty string.
- QuicString output;
+ std::string output;
QuicStrAppend(&output);
EXPECT_TRUE(output.empty());
// Single string-like argument.
const char kFoo[] = "foo";
- const QuicString string_foo(kFoo);
+ const std::string string_foo(kFoo);
const QuicStringPiece stringpiece_foo(string_foo);
QuicStrAppend(&output, kFoo);
EXPECT_EQ("foo", output);
@@ -97,7 +97,7 @@
// Two string-like arguments.
const char kBar[] = "bar";
const QuicStringPiece stringpiece_bar(kBar);
- const QuicString string_bar(kBar);
+ const std::string string_bar(kBar);
QuicStrAppend(&output, kFoo, kBar);
EXPECT_EQ("foobar", output);
QuicStrAppend(&output, kFoo, string_bar);
diff --git a/quic/platform/api/quic_text_utils.h b/quic/platform/api/quic_text_utils.h
index 5bf9890..e6c80d3 100644
--- a/quic/platform/api/quic_text_utils.h
+++ b/quic/platform/api/quic_text_utils.h
@@ -25,7 +25,7 @@
}
// Returns a new string in which |data| has been converted to lower case.
- static QuicString ToLower(QuicStringPiece data) {
+ static std::string ToLower(QuicStringPiece data) {
return QuicTextUtilsImpl::ToLower(data);
}
@@ -59,38 +59,38 @@
}
// Returns a new string representing |in|.
- static QuicString Uint64ToString(uint64_t in) {
+ static std::string Uint64ToString(uint64_t in) {
return QuicTextUtilsImpl::Uint64ToString(in);
}
// This converts |length| bytes of binary to a 2*|length|-character
// hexadecimal representation.
// Return value: 2*|length| characters of ASCII string.
- static QuicString HexEncode(const char* data, size_t length) {
+ static std::string HexEncode(const char* data, size_t length) {
return HexEncode(QuicStringPiece(data, length));
}
// This converts |data.length()| bytes of binary to a
// 2*|data.length()|-character hexadecimal representation.
// Return value: 2*|data.length()| characters of ASCII string.
- static QuicString HexEncode(QuicStringPiece data) {
+ static std::string HexEncode(QuicStringPiece data) {
return QuicTextUtilsImpl::HexEncode(data);
}
// This converts a uint32 into an 8-character hexidecimal
// representation. Return value: 8 characters of ASCII string.
- static QuicString Hex(uint32_t v) { return QuicTextUtilsImpl::Hex(v); }
+ static std::string Hex(uint32_t v) { return QuicTextUtilsImpl::Hex(v); }
// Converts |data| from a hexadecimal ASCII string to a binary string
// that is |data.length()/2| bytes long.
- static QuicString HexDecode(QuicStringPiece data) {
+ static std::string HexDecode(QuicStringPiece data) {
return QuicTextUtilsImpl::HexDecode(data);
}
// Base64 encodes with no padding |data_len| bytes of |data| into |output|.
static void Base64Encode(const uint8_t* data,
size_t data_len,
- QuicString* output) {
+ std::string* output) {
return QuicTextUtilsImpl::Base64Encode(data, data_len, output);
}
@@ -99,7 +99,7 @@
// printed as '.' in the ASCII output.
// For example, given the input "Hello, QUIC!\01\02\03\04", returns:
// "0x0000: 4865 6c6c 6f2c 2051 5549 4321 0102 0304 Hello,.QUIC!...."
- static QuicString HexDump(QuicStringPiece binary_data) {
+ static std::string HexDump(QuicStringPiece binary_data) {
return QuicTextUtilsImpl::HexDump(binary_data);
}
diff --git a/quic/platform/api/quic_text_utils_test.cc b/quic/platform/api/quic_text_utils_test.cc
index 820343c..49eb9dc 100644
--- a/quic/platform/api/quic_text_utils_test.cc
+++ b/quic/platform/api/quic_text_utils_test.cc
@@ -38,7 +38,7 @@
}
TEST_F(QuicTextUtilsTest, RemoveLeadingAndTrailingWhitespace) {
- QuicString input;
+ std::string input;
for (auto* input : {"text", " text", " text", "text ", "text ", " text ",
" text ", "\r\n\ttext", "text\n\r\t"}) {
@@ -49,9 +49,9 @@
}
TEST_F(QuicTextUtilsTest, StringToNumbers) {
- const QuicString kMaxInt32Plus1 = "2147483648";
- const QuicString kMinInt32Minus1 = "-2147483649";
- const QuicString kMaxUint32Plus1 = "4294967296";
+ const std::string kMaxInt32Plus1 = "2147483648";
+ const std::string kMinInt32Minus1 = "-2147483649";
+ const std::string kMaxUint32Plus1 = "4294967296";
{
// StringToUint64
@@ -168,8 +168,8 @@
}
TEST_F(QuicTextUtilsTest, Base64Encode) {
- QuicString output;
- QuicString input = "Hello";
+ std::string output;
+ std::string input = "Hello";
QuicTextUtils::Base64Encode(reinterpret_cast<const uint8_t*>(input.data()),
input.length(), &output);
EXPECT_EQ("SGVsbG8", output);
diff --git a/quic/platform/api/quic_thread.h b/quic/platform/api/quic_thread.h
index 75d541c..77ae2e0 100644
--- a/quic/platform/api/quic_thread.h
+++ b/quic/platform/api/quic_thread.h
@@ -13,7 +13,7 @@
// A class representing a thread of execution in QUIC.
class QuicThread : public QuicThreadImpl {
public:
- QuicThread(const QuicString& string) : QuicThreadImpl(string) {}
+ QuicThread(const std::string& string) : QuicThreadImpl(string) {}
QuicThread(const QuicThread&) = delete;
QuicThread& operator=(const QuicThread&) = delete;
