diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 8961ab872be3c..60cf509de24d1 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -1304,7 +1304,7 @@ std::unique_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
return base::MakeUnique<net::HttpCache>(
base::WrapUnique(new DevToolsNetworkTransactionFactory(
network_controller_handle_.GetController(), session)),
- std::move(main_backend), true /* set_up_quic_server_info */);
+ std::move(main_backend), true /* is_main_cache */);
}
std::unique_ptr<net::HttpCache> ProfileIOData::CreateHttpFactory(
@@ -1315,7 +1315,7 @@ std::unique_ptr<net::HttpCache> ProfileIOData::CreateHttpFactory(
return base::MakeUnique<net::HttpCache>(
base::WrapUnique(new DevToolsNetworkTransactionFactory(
network_controller_handle_.GetController(), shared_session)),
- std::move(backend), false /* set_up_quic_server_info */);
+ std::move(backend), false /* is_main_cache */);
}
void ProfileIOData::SetCookieSettingsForTesting(
diff --git a/content/shell/browser/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc
index 1943e4fe9c00e..6ee164fc68bc5 100644
--- a/content/shell/browser/shell_url_request_context_getter.cc
+++ b/content/shell/browser/shell_url_request_context_getter.cc
@@ -219,7 +219,7 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
base::MakeUnique<net::HttpNetworkSession>(network_session_params));
storage_->set_http_transaction_factory(base::MakeUnique<net::HttpCache>(
storage_->http_network_session(), std::move(main_backend),
- true /* set_up_quic_server_info */));
+ true /* is_main_cache */));
std::unique_ptr<net::URLRequestJobFactoryImpl> job_factory(
new net::URLRequestJobFactoryImpl());
diff --git a/net/cert_net/cert_net_fetcher_impl_unittest.cc b/net/cert_net/cert_net_fetcher_impl_unittest.cc
index 99f57700669c6..067e6fe2af12b 100644
--- a/net/cert_net/cert_net_fetcher_impl_unittest.cc
+++ b/net/cert_net/cert_net_fetcher_impl_unittest.cc
@@ -69,7 +69,7 @@ class RequestContext : public URLRequestContext {
base::MakeUnique<HttpNetworkSession>(params));
storage_.set_http_transaction_factory(base::MakeUnique<HttpCache>(
storage_.http_network_session(), HttpCache::DefaultBackend::InMemory(0),
- false /* set_up_quic_server_info */));
+ false /* is_main_cache */));
storage_.set_job_factory(base::MakeUnique<URLRequestJobFactoryImpl>());
}
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index b02ddf02adf0a..39b86328aff40 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -295,14 +295,14 @@ class HttpCache::QuicServerInfoFactoryAdaptor : public QuicServerInfoFactory {
//-----------------------------------------------------------------------------
HttpCache::HttpCache(HttpNetworkSession* session,
std::unique_ptr<BackendFactory> backend_factory,
- bool set_up_quic_server_info)
+ bool is_main_cache)
: HttpCache(base::MakeUnique<HttpNetworkLayer>(session),
std::move(backend_factory),
- set_up_quic_server_info) {}
+ is_main_cache) {}
HttpCache::HttpCache(std::unique_ptr<HttpTransactionFactory> network_layer,
std::unique_ptr<BackendFactory> backend_factory,
- bool set_up_quic_server_info)
+ bool is_main_cache)
: net_log_(nullptr),
backend_factory_(std::move(backend_factory)),
building_backend_(false),
@@ -318,7 +318,7 @@ HttpCache::HttpCache(std::unique_ptr<HttpTransactionFactory> network_layer,
// rather than having logic only used in unit tests here.
if (session) {
net_log_ = session->net_log();
- if (set_up_quic_server_info &&
+ if (is_main_cache &&
!session->quic_stream_factory()->has_quic_server_info_factory()) {
// QuicStreamFactory takes ownership of QuicServerInfoFactoryAdaptor.
session->quic_stream_factory()->set_quic_server_info_factory(
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 2aae2fcf27e1c..f881b2a056c71 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -123,17 +123,18 @@ class NET_EXPORT HttpCache : public HttpTransactionFactory,
//
// The HttpCache must be destroyed before the HttpNetworkSession.
//
- // If |set_up_quic_server_info| is true, configures the cache to track
+ // If |is_main_cache| is true, configures the cache to track
// information about servers supporting QUIC.
+ // TODO(zhongyi): remove |is_main_cache| when we get rid of cache split.
HttpCache(HttpNetworkSession* session,
std::unique_ptr<BackendFactory> backend_factory,
- bool set_up_quic_server_info);
+ bool is_main_cache);
// Initialize the cache from its component parts. |network_layer| and
// |backend_factory| will be destroyed when the HttpCache is.
HttpCache(std::unique_ptr<HttpTransactionFactory> network_layer,
std::unique_ptr<BackendFactory> backend_factory,
- bool set_up_quic_server_info);
+ bool is_main_cache);
~HttpCache() override;
diff --git a/net/http/mock_http_cache.cc b/net/http/mock_http_cache.cc
index d7c08bace79c8..205a45e4b05d7 100644
--- a/net/http/mock_http_cache.cc
+++ b/net/http/mock_http_cache.cc
@@ -546,16 +546,15 @@ MockHttpCache::MockHttpCache(
std::unique_ptr<HttpCache::BackendFactory> disk_cache_factory)
: MockHttpCache(std::move(disk_cache_factory), false) {}
-MockHttpCache::MockHttpCache(bool set_up_quic_server_info)
- : MockHttpCache(base::MakeUnique<MockBackendFactory>(),
- set_up_quic_server_info) {}
+MockHttpCache::MockHttpCache(bool is_main_cache)
+ : MockHttpCache(base::MakeUnique<MockBackendFactory>(), is_main_cache) {}
MockHttpCache::MockHttpCache(
std::unique_ptr<HttpCache::BackendFactory> disk_cache_factory,
- bool set_up_quic_server_info)
+ bool is_main_cache)
: http_cache_(base::MakeUnique<MockNetworkLayer>(),
std::move(disk_cache_factory),
- set_up_quic_server_info) {}
+ is_main_cache) {}
disk_cache::Backend* MockHttpCache::backend() {
TestCompletionCallback cb;
diff --git a/net/http/mock_http_cache.h b/net/http/mock_http_cache.h
index c6612c4ffbf93..c920387f02b7c 100644
--- a/net/http/mock_http_cache.h
+++ b/net/http/mock_http_cache.h
@@ -182,11 +182,11 @@ class MockHttpCache {
MockHttpCache();
explicit MockHttpCache(
std::unique_ptr<HttpCache::BackendFactory> disk_cache_factory);
- // |set_up_quic_server_info| if set, will set a quic server info factory.
- explicit MockHttpCache(bool set_up_quic_server_info);
+ // |is_main_cache| if set, will set a quic server info factory.
+ explicit MockHttpCache(bool is_main_cache);
MockHttpCache(std::unique_ptr<HttpCache::BackendFactory> disk_cache_factory,
- bool set_up_quic_server_info);
+ bool is_main_cache);
HttpCache* http_cache() { return &http_cache_; }
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index fa6282d0c94f3..5e4e84aa60879 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -7769,7 +7769,8 @@ TEST_F(URLRequestTest, QuicServerInfoFactoryTest) {
new HttpNetworkLayer(&session));
HttpCache main_cache(std::move(network_layer1),
- HttpCache::DefaultBackend::InMemory(0), true);
+ HttpCache::DefaultBackend::InMemory(0),
+ true /* is_main_cache */);
EXPECT_TRUE(session.quic_stream_factory()->has_quic_server_info_factory());
@@ -7864,7 +7865,7 @@ TEST_F(URLRequestTestHTTP, NetworkSuspendTest) {
HttpCache http_cache(std::move(network_layer),
HttpCache::DefaultBackend::InMemory(0),
- false /* set_up_quic_server_info_factory */);
+ false /* is_main_cache */);
TestURLRequestContext context(true);
context.set_http_transaction_factory(&http_cache);
@@ -9205,8 +9206,9 @@ TEST_F(HTTPSRequestTest, SSLSessionCacheShardTest) {
params.http_server_properties = default_context_.http_server_properties();
HttpNetworkSession network_session(params);
- std::unique_ptr<HttpCache> cache(new HttpCache(
- &network_session, HttpCache::DefaultBackend::InMemory(0), false));
+ std::unique_ptr<HttpCache> cache(
+ new HttpCache(&network_session, HttpCache::DefaultBackend::InMemory(0),
+ false /* is_main_cache */));
default_context_.set_http_transaction_factory(cache.get());
diff --git a/net/url_request/view_cache_helper_unittest.cc b/net/url_request/view_cache_helper_unittest.cc
index 2e28372bb731f..2946b18bf1236 100644
--- a/net/url_request/view_cache_helper_unittest.cc
+++ b/net/url_request/view_cache_helper_unittest.cc
@@ -38,7 +38,7 @@ class TestURLRequestContext : public URLRequestContext {
TestURLRequestContext::TestURLRequestContext()
: cache_(base::MakeUnique<MockNetworkLayer>(),
HttpCache::DefaultBackend::InMemory(0),
- false /* set_up_quic_server_info */) {
+ false /* is_main_cache */) {
set_http_transaction_factory(&cache_);
}