Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index f1aa16dde8cea4978d9e4bcccef181bb29f34a52..9379091918eabab2ef232513c4d36f2389a93b41 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -80,6 +80,7 @@ |
#include "net/http/http_auth_filter.h" |
#include "net/http/http_auth_handler_factory.h" |
#include "net/http/http_auth_preferences.h" |
+#include "net/http/http_features.h" |
#include "net/http/http_network_layer.h" |
#include "net/http/http_network_session.h" |
#include "net/http/http_server_properties_impl.h" |
@@ -844,6 +845,8 @@ void IOThread::Init() { |
switches::kEnableUserAlternateProtocolPorts)) { |
globals_->enable_user_alternate_protocol_ports = true; |
} |
+ globals_->enable_brotli.set( |
+ base::FeatureList::IsEnabled(net::features::kBrotliEncodingFeature)); |
// 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( |