Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1689)

Unified Diff: net/tools/quic/end_to_end_test.cc

Issue 2532083005: Rename QuicInMemoryCache to QuicHttpResponseCache. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/test_tools/mock_quic_dispatcher.cc ('k') | net/tools/quic/quic_http_response_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/quic/end_to_end_test.cc
diff --git a/net/tools/quic/end_to_end_test.cc b/net/tools/quic/end_to_end_test.cc
index 2cf9a69214ce5caf81f532f1b489f5f3eced253f..b9385d5085db24991baaaa4dd53aeca44b8d2c37 100644
--- a/net/tools/quic/end_to_end_test.cc
+++ b/net/tools/quic/end_to_end_test.cc
@@ -44,7 +44,7 @@
#include "net/test/gtest_util.h"
#include "net/tools/epoll_server/epoll_server.h"
#include "net/tools/quic/quic_epoll_connection_helper.h"
-#include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/tools/quic/quic_http_response_cache.h"
#include "net/tools/quic/quic_packet_writer_wrapper.h"
#include "net/tools/quic/quic_server.h"
#include "net/tools/quic/quic_simple_server_stream.h"
@@ -429,7 +429,7 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
auto test_server = new QuicTestServer(
CryptoTestUtils::ProofSourceForTesting(), server_config_,
- server_supported_versions_, &in_memory_cache_);
+ server_supported_versions_, &response_cache_);
server_thread_.reset(new ServerThread(test_server, server_address_));
if (chlo_multiplier_ != 0) {
server_thread_->server()->SetChloMultiplier(chlo_multiplier_);
@@ -466,8 +466,8 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
}
void AddToCache(StringPiece path, int response_code, StringPiece body) {
- in_memory_cache_.AddSimpleResponse(server_hostname_, path, response_code,
- body);
+ response_cache_.AddSimpleResponse(server_hostname_, path, response_code,
+ body);
}
void SetPacketLossPercentage(int32_t loss) {
@@ -557,7 +557,7 @@ class EndToEndTest : public ::testing::TestWithParam<TestParams> {
bool initialized_;
QuicSocketAddress server_address_;
string server_hostname_;
- QuicInMemoryCache in_memory_cache_;
+ QuicHttpResponseCache response_cache_;
std::unique_ptr<ServerThread> server_thread_;
std::unique_ptr<QuicTestClient> client_;
PacketDroppingTestWriter* client_writer_;
@@ -2134,9 +2134,9 @@ class ServerStreamWithErrorResponseBody : public QuicSimpleServerStream {
public:
ServerStreamWithErrorResponseBody(QuicStreamId id,
QuicSpdySession* session,
- QuicInMemoryCache* in_memory_cache,
+ QuicHttpResponseCache* response_cache,
string response_body)
- : QuicSimpleServerStream(id, session, in_memory_cache),
+ : QuicSimpleServerStream(id, session, response_cache),
response_body_(std::move(response_body)) {}
~ServerStreamWithErrorResponseBody() override {}
@@ -2166,8 +2166,8 @@ class StreamWithErrorFactory : public QuicTestServer::StreamFactory {
QuicSimpleServerStream* CreateStream(
QuicStreamId id,
QuicSpdySession* session,
- QuicInMemoryCache* in_memory_cache) override {
- return new ServerStreamWithErrorResponseBody(id, session, in_memory_cache,
+ QuicHttpResponseCache* response_cache) override {
+ return new ServerStreamWithErrorResponseBody(id, session, response_cache,
response_body_);
}
@@ -2180,8 +2180,8 @@ class ServerStreamThatDropsBody : public QuicSimpleServerStream {
public:
ServerStreamThatDropsBody(QuicStreamId id,
QuicSpdySession* session,
- QuicInMemoryCache* in_memory_cache)
- : QuicSimpleServerStream(id, session, in_memory_cache) {}
+ QuicHttpResponseCache* response_cache)
+ : QuicSimpleServerStream(id, session, response_cache) {}
~ServerStreamThatDropsBody() override {}
@@ -2223,8 +2223,8 @@ class ServerStreamThatDropsBodyFactory : public QuicTestServer::StreamFactory {
QuicSimpleServerStream* CreateStream(
QuicStreamId id,
QuicSpdySession* session,
- QuicInMemoryCache* in_memory_cache) override {
- return new ServerStreamThatDropsBody(id, session, in_memory_cache);
+ QuicHttpResponseCache* response_cache) override {
+ return new ServerStreamThatDropsBody(id, session, response_cache);
}
};
@@ -2233,16 +2233,16 @@ class ServerStreamThatSendsHugeResponse : public QuicSimpleServerStream {
public:
ServerStreamThatSendsHugeResponse(QuicStreamId id,
QuicSpdySession* session,
- QuicInMemoryCache* in_memory_cache,
+ QuicHttpResponseCache* response_cache,
int64_t body_bytes)
- : QuicSimpleServerStream(id, session, in_memory_cache),
+ : QuicSimpleServerStream(id, session, response_cache),
body_bytes_(body_bytes) {}
~ServerStreamThatSendsHugeResponse() override {}
protected:
void SendResponse() override {
- QuicInMemoryCache::Response response;
+ QuicHttpResponseCache::Response response;
string body(body_bytes_, 'a');
response.set_body(body);
SendHeadersAndBodyAndTrailers(response.headers().Clone(), response.body(),
@@ -2266,8 +2266,8 @@ class ServerStreamThatSendsHugeResponseFactory
QuicSimpleServerStream* CreateStream(
QuicStreamId id,
QuicSpdySession* session,
- QuicInMemoryCache* in_memory_cache) override {
- return new ServerStreamThatSendsHugeResponse(id, session, in_memory_cache,
+ QuicHttpResponseCache* response_cache) override {
+ return new ServerStreamThatSendsHugeResponse(id, session, response_cache,
body_bytes_);
}
@@ -2484,8 +2484,8 @@ TEST_P(EndToEndTest, Trailers) {
SpdyHeaderBlock trailers;
trailers["some-trailing-header"] = "trailing-header-value";
- in_memory_cache_.AddResponse(server_hostname_, "/trailer_url",
- std::move(headers), kBody, trailers.Clone());
+ response_cache_.AddResponse(server_hostname_, "/trailer_url",
+ std::move(headers), kBody, trailers.Clone());
EXPECT_EQ(kBody, client_->SendSynchronousRequest("/trailer_url"));
EXPECT_EQ("200", client_->response_headers()->find(":status")->second);
@@ -2522,7 +2522,7 @@ class EndToEndTestServerPush : public EndToEndTest {
// push response.
large_resource = string(resource_size, 'a');
}
- std::list<QuicInMemoryCache::ServerPushInfo> push_resources;
+ std::list<QuicHttpResponseCache::ServerPushInfo> push_resources;
for (size_t i = 0; i < num_resources; ++i) {
string url = push_urls[i];
GURL resource_url(url);
@@ -2533,11 +2533,11 @@ class EndToEndTestServerPush : public EndToEndTest {
response_headers[":version"] = "HTTP/1.1";
response_headers[":status"] = "200";
response_headers["content-length"] = IntToString(body.size());
- push_resources.push_back(QuicInMemoryCache::ServerPushInfo(
+ push_resources.push_back(QuicHttpResponseCache::ServerPushInfo(
resource_url, std::move(response_headers), kV3LowestPriority, body));
}
- in_memory_cache_.AddSimpleResponseWithServerPushResources(
+ response_cache_.AddSimpleResponseWithServerPushResources(
host, path, 200, response_body, push_resources);
}
};
« no previous file with comments | « net/quic/test_tools/mock_quic_dispatcher.cc ('k') | net/tools/quic/quic_http_response_cache.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698