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/tools/quic_memory_cache_backend_test.cc b/quic/tools/quic_memory_cache_backend_test.cc
index e5f5db1..80b1b29 100644
--- a/quic/tools/quic_memory_cache_backend_test.cc
+++ b/quic/tools/quic_memory_cache_backend_test.cc
@@ -20,8 +20,8 @@
class QuicMemoryCacheBackendTest : public QuicTest {
protected:
- void CreateRequest(QuicString host,
- QuicString path,
+ void CreateRequest(std::string host,
+ std::string path,
spdy::SpdyHeaderBlock* headers) {
(*headers)[":method"] = "GET";
(*headers)[":path"] = path;
@@ -29,7 +29,7 @@
(*headers)[":scheme"] = "https";
}
- QuicString CacheDirectory() { return QuicGetTestMemoryCachePath(); }
+ std::string CacheDirectory() { return QuicGetTestMemoryCachePath(); }
QuicMemoryCacheBackend cache_;
};
@@ -41,7 +41,7 @@
}
TEST_F(QuicMemoryCacheBackendTest, AddSimpleResponseGetResponse) {
- QuicString response_body("hello response");
+ std::string response_body("hello response");
cache_.AddSimpleResponse("www.google.com", "/", 200, response_body);
spdy::SpdyHeaderBlock request_headers;
@@ -54,9 +54,9 @@
}
TEST_F(QuicMemoryCacheBackendTest, AddResponse) {
- const QuicString kRequestHost = "www.foo.com";
- const QuicString kRequestPath = "/";
- const QuicString kResponseBody("hello response");
+ const std::string kRequestHost = "www.foo.com";
+ const std::string kRequestPath = "/";
+ const std::string kResponseBody("hello response");
spdy::SpdyHeaderBlock response_headers;
response_headers[":version"] = "HTTP/1.1";
@@ -151,17 +151,17 @@
}
TEST_F(QuicMemoryCacheBackendTest, AddSimpleResponseWithServerPushResources) {
- QuicString request_host = "www.foo.com";
- QuicString response_body("hello response");
+ std::string request_host = "www.foo.com";
+ std::string response_body("hello response");
const size_t kNumResources = 5;
int NumResources = 5;
std::list<ServerPushInfo> push_resources;
- QuicString scheme = "http";
+ std::string scheme = "http";
for (int i = 0; i < NumResources; ++i) {
- QuicString path = "/server_push_src" + QuicTextUtils::Uint64ToString(i);
- QuicString url = scheme + "://" + request_host + path;
+ std::string path = "/server_push_src" + QuicTextUtils::Uint64ToString(i);
+ std::string url = scheme + "://" + request_host + path;
QuicUrl resource_url(url);
- QuicString body =
+ std::string body =
QuicStrCat("This is server push response body for ", path);
spdy::SpdyHeaderBlock response_headers;
response_headers[":version"] = "HTTP/1.1";
@@ -175,7 +175,7 @@
cache_.AddSimpleResponseWithServerPushResources(
request_host, "/", 200, response_body, push_resources);
- QuicString request_url = request_host + "/";
+ std::string request_url = request_host + "/";
std::list<ServerPushInfo> resources =
cache_.GetServerPushResources(request_url);
ASSERT_EQ(kNumResources, resources.size());
@@ -189,18 +189,19 @@
}
TEST_F(QuicMemoryCacheBackendTest, GetServerPushResourcesAndPushResponses) {
- QuicString request_host = "www.foo.com";
- QuicString response_body("hello response");
+ std::string request_host = "www.foo.com";
+ std::string response_body("hello response");
const size_t kNumResources = 4;
int NumResources = 4;
- QuicString scheme = "http";
- QuicString push_response_status[kNumResources] = {"200", "200", "301", "404"};
+ std::string scheme = "http";
+ std::string push_response_status[kNumResources] = {"200", "200", "301",
+ "404"};
std::list<ServerPushInfo> push_resources;
for (int i = 0; i < NumResources; ++i) {
- QuicString path = "/server_push_src" + QuicTextUtils::Uint64ToString(i);
- QuicString url = scheme + "://" + request_host + path;
+ std::string path = "/server_push_src" + QuicTextUtils::Uint64ToString(i);
+ std::string url = scheme + "://" + request_host + path;
QuicUrl resource_url(url);
- QuicString body = "This is server push response body for " + path;
+ std::string body = "This is server push response body for " + path;
spdy::SpdyHeaderBlock response_headers;
response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = push_response_status[i];
@@ -211,15 +212,15 @@
}
cache_.AddSimpleResponseWithServerPushResources(
request_host, "/", 200, response_body, push_resources);
- QuicString request_url = request_host + "/";
+ std::string request_url = request_host + "/";
std::list<ServerPushInfo> resources =
cache_.GetServerPushResources(request_url);
ASSERT_EQ(kNumResources, resources.size());
int i = 0;
for (const auto& push_resource : push_resources) {
QuicUrl url = resources.front().request_url;
- QuicString host = url.host();
- QuicString path = url.path();
+ std::string host = url.host();
+ std::string path = url.path();
const Response* response = cache_.GetResponse(host, path);
ASSERT_TRUE(response);
ASSERT_TRUE(QuicContainsKey(response->headers(), ":status"));
