| Index: chrome/browser/io_thread.cc
|
| diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
|
| index 2301ab5ab5965f00311c4b15320e022f4d42f313..a835db6be8c82f37a6c80595d074f5f43cfd60bf 100644
|
| --- a/chrome/browser/io_thread.cc
|
| +++ b/chrome/browser/io_thread.cc
|
| @@ -441,8 +441,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() {}
|
|
|
| @@ -802,6 +802,9 @@ void IOThread::Init() {
|
| switches::kEnableUserAlternateProtocolPorts)) {
|
| globals_->enable_user_alternate_protocol_ports = true;
|
| }
|
| + if (command_line.HasSwitch(switches::kEnableTokenBinding)) {
|
| + globals_->enable_token_binding = true;
|
| + }
|
| // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
|
| // is fixed.
|
| tracked_objects::ScopedTracker tracking_profile13(
|
| @@ -1112,6 +1115,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 {
|
|
|