Move bool enable_brotli from HttpNetworkSession::Params

chrome/browser/io_thread.cc

Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 99a914c8229e65878c55c0d0a8716ddabe5f111d..77269f530a068a6c95f5b618829dbaae41ecf36b 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -412,7 +412,8 @@ SystemRequestContextLeakChecker::~SystemRequestContextLeakChecker() {
     globals_->system_request_context->AssertNoURLRequests();
 }
 
-IOThread::Globals::Globals() : system_request_context_leak_checker(this) {}
+IOThread::Globals::Globals() : system_request_context_leak_checker(this),
+                               enable_brotli(false) {}
 
 IOThread::Globals::~Globals() {}
 
@@ -802,7 +803,7 @@ void IOThread::Init() {
           switches::kEnableUserAlternateProtocolPorts)) {
     params_.enable_user_alternate_protocol_ports = true;
   }
-  params_.enable_brotli =
+  globals_->enable_brotli =
       base::FeatureList::IsEnabled(features::kBrotliEncoding);
   params_.enable_token_binding =
       base::FeatureList::IsEnabled(features::kTokenBinding);
@@ -1677,6 +1678,8 @@ net::URLRequestContext* IOThread::ConstructSystemRequestContext(
   context->set_http_server_properties(
       globals->http_server_properties->GetWeakPtr());
 
+  context->set_enable_brotli(globals->enable_brotli);
+
   net::HttpNetworkSession::Params system_params(params);
   net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
       context, &system_params);
@@ -1726,6 +1729,8 @@ net::URLRequestContext* IOThread::ConstructProxyScriptFetcherContext(
   context->set_http_server_properties(
       globals->http_server_properties->GetWeakPtr());
 
+  context->set_enable_brotli(globals->enable_brotli);
+
   net::HttpNetworkSession::Params session_params(params);
   net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
       context, &session_params);