Index: chrome/browser/io_thread.cc |
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
index cc33dc19a98910b7a52ae349fe5c8fc29b078782..63a7ab82a53a21dac3543561054a666aded9a00d 100644 |
--- a/chrome/browser/io_thread.cc |
+++ b/chrome/browser/io_thread.cc |
@@ -842,6 +842,7 @@ void IOThread::Init() { |
switches::kEnableUserAlternateProtocolPorts)) { |
globals_->enable_user_alternate_protocol_ports = true; |
} |
+ globals_->enable_brotli.set(ShouldEnableBrotli(command_line)); |
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
// is fixed. |
tracked_objects::ScopedTracker tracking_profile13( |
@@ -1137,6 +1138,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( |
@@ -1349,6 +1352,12 @@ void IOThread::ConfigureQuicGlobals( |
} |
} |
+bool IOThread::ShouldEnableBrotli(const base::CommandLine& command_line) { |
+ if (command_line.HasSwitch(switches::kDisableBrotli)) |
+ return false; |
+ return command_line.HasSwitch(switches::kEnableBrotli); |
Ryan Sleevi
2015/12/09 18:10:10
Why did you go the route of double-flags? Typicall
eustas
2015/12/10 16:19:24
Well, I think I need someone's help/advise to impl
|
+} |
+ |
bool IOThread::ShouldEnableQuic(const base::CommandLine& command_line, |
base::StringPiece quic_trial_group, |
bool quic_allowed_by_policy) { |