Remove SpdyStrCat, use QuicheStrCat instead. gfe-relnote: n/a, no functional change. PiperOrigin-RevId: 290869445 Change-Id: I3a54883971e929fed6c9341b124a96b37ac642da
diff --git a/spdy/core/fifo_write_scheduler.h b/spdy/core/fifo_write_scheduler.h index aa904f6..a2c6989 100644 --- a/spdy/core/fifo_write_scheduler.h +++ b/spdy/core/fifo_write_scheduler.h
@@ -9,6 +9,7 @@ #include <set> #include <string> +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/spdy/core/write_scheduler.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" @@ -210,7 +211,7 @@ template <typename StreamIdType> std::string FifoWriteScheduler<StreamIdType>::DebugString() const { - return SpdyStrCat( + return quiche::QuicheStrCat( "FifoWriteScheduler {num_streams=", registered_streams_.size(), " num_ready_streams=", NumReadyStreams(), "}"); }
diff --git a/spdy/core/hpack/hpack_entry.cc b/spdy/core/hpack/hpack_entry.cc index c96e35c..586f321 100644 --- a/spdy/core/hpack/hpack_entry.cc +++ b/spdy/core/hpack/hpack_entry.cc
@@ -4,9 +4,9 @@ #include "net/third_party/quiche/src/spdy/core/hpack/hpack_entry.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_estimate_memory_usage.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" namespace spdy { @@ -78,7 +78,7 @@ } std::string HpackEntry::GetDebugString() const { - return SpdyStrCat( + return quiche::QuicheStrCat( "{ name: \"", name_ref_, "\", value: \"", value_ref_, "\", index: ", insertion_index_, " ", (IsStatic() ? " static" : (IsLookup() ? " lookup" : " dynamic")), " }");
diff --git a/spdy/core/http2_priority_write_scheduler.h b/spdy/core/http2_priority_write_scheduler.h index 4a2b4f0..2bb8fbe 100644 --- a/spdy/core/http2_priority_write_scheduler.h +++ b/spdy/core/http2_priority_write_scheduler.h
@@ -17,6 +17,7 @@ #include <utility> #include <vector> +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/spdy/core/spdy_intrusive_list.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" #include "net/third_party/quiche/src/spdy/core/write_scheduler.h" @@ -713,9 +714,9 @@ template <typename StreamIdType> std::string Http2PriorityWriteScheduler<StreamIdType>::DebugString() const { - return SpdyStrCat("Http2PriorityWriteScheduler {num_registered_streams=", - NumRegisteredStreams(), - " num_ready_streams=", NumReadyStreams(), "}"); + return quiche::QuicheStrCat( + "Http2PriorityWriteScheduler {num_registered_streams=", + NumRegisteredStreams(), " num_ready_streams=", NumReadyStreams(), "}"); } template <typename StreamIdType>
diff --git a/spdy/core/lifo_write_scheduler.h b/spdy/core/lifo_write_scheduler.h index b532c86..405ccf5 100644 --- a/spdy/core/lifo_write_scheduler.h +++ b/spdy/core/lifo_write_scheduler.h
@@ -9,9 +9,9 @@ #include <set> #include <string> +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/spdy/core/write_scheduler.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_containers.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" namespace spdy { @@ -198,7 +198,7 @@ template <typename StreamIdType> std::string LifoWriteScheduler<StreamIdType>::DebugString() const { - return SpdyStrCat( + return quiche::QuicheStrCat( "LifoWriteScheduler {num_streams=", registered_streams_.size(), " num_ready_streams=", NumReadyStreams(), "}"); }
diff --git a/spdy/core/priority_write_scheduler.h b/spdy/core/priority_write_scheduler.h index 15939e0..72e3d18 100644 --- a/spdy/core/priority_write_scheduler.h +++ b/spdy/core/priority_write_scheduler.h
@@ -15,12 +15,12 @@ #include <vector> #include "net/third_party/quiche/src/http2/platform/api/http2_containers.h" +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/spdy/core/spdy_protocol.h" #include "net/third_party/quiche/src/spdy/core/write_scheduler.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_bug_tracker.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_macros.h" -#include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" namespace spdy { @@ -261,7 +261,7 @@ size_t NumRegisteredStreams() const override { return stream_infos_.size(); } std::string DebugString() const override { - return SpdyStrCat( + return quiche::QuicheStrCat( "PriorityWriteScheduler {num_streams=", stream_infos_.size(), " num_ready_streams=", NumReadyStreams(), "}"); }
diff --git a/spdy/core/spdy_alt_svc_wire_format.cc b/spdy/core/spdy_alt_svc_wire_format.cc index 2f90ab3..90dbab8 100644 --- a/spdy/core/spdy_alt_svc_wire_format.cc +++ b/spdy/core/spdy_alt_svc_wire_format.cc
@@ -8,6 +8,7 @@ #include <cctype> #include <limits> +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_logging.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" @@ -266,9 +267,9 @@ } value.push_back(c); } - value.append(SpdyStrCat(":", altsvc.port, "\"")); + value.append(quiche::QuicheStrCat(":", altsvc.port, "\"")); if (altsvc.max_age != 86400) { - value.append(SpdyStrCat("; ma=", altsvc.max_age)); + value.append(quiche::QuicheStrCat("; ma=", altsvc.max_age)); } if (!altsvc.version.empty()) { if (is_ietf_format_quic) { @@ -283,7 +284,7 @@ if (it != altsvc.version.begin()) { value.append(","); } - value.append(SpdyStrCat(*it)); + value.append(quiche::QuicheStrCat(*it)); } value.append("\""); }
diff --git a/spdy/core/spdy_protocol.cc b/spdy/core/spdy_protocol.cc index 4a59d55..a4a72d6 100644 --- a/spdy/core/spdy_protocol.cc +++ b/spdy/core/spdy_protocol.cc
@@ -7,6 +7,7 @@ #include <limits> #include <ostream> +#include "net/third_party/quiche/src/common/platform/api/quiche_str_cat.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_bug_tracker.h" #include "net/third_party/quiche/src/spdy/platform/api/spdy_string_utils.h" @@ -159,8 +160,8 @@ std::string SettingsIdToString(SpdySettingsId id) { SpdyKnownSettingsId known_id; if (!ParseSettingsId(id, &known_id)) { - return SpdyStrCat("SETTINGS_UNKNOWN_", - SpdyHexEncodeUInt32AndTrim(uint32_t{id})); + return quiche::QuicheStrCat("SETTINGS_UNKNOWN_", + SpdyHexEncodeUInt32AndTrim(uint32_t{id})); } switch (known_id) { @@ -182,8 +183,8 @@ return "SETTINGS_EXPERIMENT_SCHEDULER"; } - return SpdyStrCat("SETTINGS_UNKNOWN_", - SpdyHexEncodeUInt32AndTrim(uint32_t{id})); + return quiche::QuicheStrCat("SETTINGS_UNKNOWN_", + SpdyHexEncodeUInt32AndTrim(uint32_t{id})); } SpdyErrorCode ParseErrorCode(uint32_t wire_error_code) {
diff --git a/spdy/platform/api/spdy_string_utils.h b/spdy/platform/api/spdy_string_utils.h index 473a394..b023f73 100644 --- a/spdy/platform/api/spdy_string_utils.h +++ b/spdy/platform/api/spdy_string_utils.h
@@ -20,11 +20,6 @@ namespace spdy { template <typename... Args> -inline std::string SpdyStrCat(const Args&... args) { - return SpdyStrCatImpl(std::forward<const Args&>(args)...); -} - -template <typename... Args> inline void SpdyStrAppend(std::string* output, const Args&... args) { SpdyStrAppendImpl(output, std::forward<const Args&>(args)...); }
diff --git a/spdy/platform/api/spdy_string_utils_test.cc b/spdy/platform/api/spdy_string_utils_test.cc index 2134348..9ca387a 100644 --- a/spdy/platform/api/spdy_string_utils_test.cc +++ b/spdy/platform/api/spdy_string_utils_test.cc
@@ -13,63 +13,6 @@ namespace test { namespace { -TEST(SpdyStringUtilsTest, SpdyStrCat) { - // No arguments. - EXPECT_EQ("", SpdyStrCat()); - - // Single string-like argument. - const char kFoo[] = "foo"; - const std::string string_foo(kFoo); - const quiche::QuicheStringPiece stringpiece_foo(string_foo); - EXPECT_EQ("foo", SpdyStrCat(kFoo)); - EXPECT_EQ("foo", SpdyStrCat(string_foo)); - EXPECT_EQ("foo", SpdyStrCat(stringpiece_foo)); - - // Two string-like arguments. - const char kBar[] = "bar"; - const quiche::QuicheStringPiece stringpiece_bar(kBar); - const std::string string_bar(kBar); - EXPECT_EQ("foobar", SpdyStrCat(kFoo, kBar)); - EXPECT_EQ("foobar", SpdyStrCat(kFoo, string_bar)); - EXPECT_EQ("foobar", SpdyStrCat(kFoo, stringpiece_bar)); - EXPECT_EQ("foobar", SpdyStrCat(string_foo, kBar)); - EXPECT_EQ("foobar", SpdyStrCat(string_foo, string_bar)); - EXPECT_EQ("foobar", SpdyStrCat(string_foo, stringpiece_bar)); - EXPECT_EQ("foobar", SpdyStrCat(stringpiece_foo, kBar)); - EXPECT_EQ("foobar", SpdyStrCat(stringpiece_foo, string_bar)); - EXPECT_EQ("foobar", SpdyStrCat(stringpiece_foo, stringpiece_bar)); - - // Many-many arguments. - EXPECT_EQ( - "foobarbazquxquuxquuzcorgegraultgarplywaldofredplughxyzzythud", - SpdyStrCat("foo", "bar", "baz", "qux", "quux", "quuz", "corge", "grault", - "garply", "waldo", "fred", "plugh", "xyzzy", "thud")); - - // Numerical arguments. - const int16_t i = 1; - const uint64_t u = 8; - const double d = 3.1415; - - EXPECT_EQ("1 8", SpdyStrCat(i, " ", u)); - EXPECT_EQ("3.14151181", SpdyStrCat(d, i, i, u, i)); - EXPECT_EQ("i: 1, u: 8, d: 3.1415", - SpdyStrCat("i: ", i, ", u: ", u, ", d: ", d)); - - // Boolean arguments. - const bool t = true; - const bool f = false; - - EXPECT_EQ("1", SpdyStrCat(t)); - EXPECT_EQ("0", SpdyStrCat(f)); - EXPECT_EQ("0110", SpdyStrCat(f, t, t, f)); - - // Mixed string-like, numerical, and Boolean arguments. - EXPECT_EQ("foo1foo081bar3.14151", - SpdyStrCat(kFoo, i, string_foo, f, u, t, stringpiece_bar, d, t)); - EXPECT_EQ("3.141511bar18bar13.14150", - SpdyStrCat(d, t, t, string_bar, i, u, kBar, t, d, f)); -} - TEST(SpdyStringUtilsTest, SpdyStrAppend) { // No arguments on empty string. std::string output;