| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index f1aa16dde8cea4978d9e4bcccef181bb29f34a52..cc7872f5efc962fa7e2d6533fe823dad312db444 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -56,6 +56,7 @@
|
| #include "components/version_info/version_info.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/cookie_store_factory.h"
|
| +#include "content/public/common/content_features.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/user_agent.h"
|
| #include "net/base/external_estimate_provider.h"
|
| @@ -844,6 +845,8 @@ void IOThread::Init() {
|
| switches::kEnableUserAlternateProtocolPorts)) {
|
| globals_->enable_user_alternate_protocol_ports = true;
|
| }
|
| + globals_->enable_brotli.set(
|
| + base::FeatureList::IsEnabled(features::kBrotliEncoding));
|
| // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
|
| // is fixed.
|
| tracked_objects::ScopedTracker tracking_profile13(
|
| @@ -1138,6 +1141,8 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals(
|
|
|
| globals.enable_npn.CopyToIfSet(¶ms->enable_npn);
|
|
|
| + globals.enable_brotli.CopyToIfSet(¶ms->enable_brotli);
|
| +
|
| globals.enable_quic.CopyToIfSet(¶ms->enable_quic);
|
| globals.enable_quic_for_proxies.CopyToIfSet(¶ms->enable_quic_for_proxies);
|
| globals.quic_always_require_handshake_confirmation.CopyToIfSet(
|
|
|