Chromium Code Reviews| Index: chrome/browser/io_thread.cc |
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc |
| index 0de54ea70fbfc92850374818d72cc22f8e570549..5e38908011b16f7cd7e53a89dd3e86d751fa7ceb 100644 |
| --- a/chrome/browser/io_thread.cc |
| +++ b/chrome/browser/io_thread.cc |
| @@ -455,8 +455,8 @@ IOThread::Globals::Globals() |
| ignore_certificate_errors(false), |
| testing_fixed_http_port(0), |
| testing_fixed_https_port(0), |
| - enable_user_alternate_protocol_ports(false) { |
| -} |
| + enable_user_alternate_protocol_ports(false), |
| + enable_token_binding(false) {} |
| IOThread::Globals::~Globals() {} |
| @@ -847,6 +847,9 @@ void IOThread::Init() { |
| } |
| globals_->enable_brotli.set( |
| base::FeatureList::IsEnabled(features::kBrotliEncoding)); |
| + if (command_line.HasSwitch(switches::kEnableTokenBinding)) { |
|
Ryan Sleevi
2016/01/26 22:53:47
As command-line switches are generally inaccessibl
nharper
2016/01/26 23:29:30
There is a plan to add it to about:flags - see htt
|
| + globals_->enable_token_binding = true; |
| + } |
| // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
| // is fixed. |
| tracked_objects::ScopedTracker tracking_profile13( |
| @@ -1188,6 +1191,7 @@ void IOThread::InitializeNetworkSessionParamsFromGlobals( |
| ¶ms->origin_to_force_quic_on); |
| params->enable_user_alternate_protocol_ports = |
| globals.enable_user_alternate_protocol_ports; |
| + params->enable_token_binding = globals.enable_token_binding; |
| } |
| base::TimeTicks IOThread::creation_time() const { |