| Index: net/base/ssl_config_service.cc
|
| diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc
|
| index ad2928e16172f262aba580eb4449f02b1b5dd880..f9ee9ef8baa6cf9c968b67837864ef4fb1e565fa 100644
|
| --- a/net/base/ssl_config_service.cc
|
| +++ b/net/base/ssl_config_service.cc
|
| @@ -74,6 +74,7 @@ SSLConfigService::SSLConfigService()
|
| }
|
|
|
| static bool g_cached_info_enabled = false;
|
| +static bool g_channel_id_trial = false;
|
|
|
| // GlobalCRLSet holds a reference to the global CRLSet. It simply wraps a lock
|
| // around a scoped_refptr so that getting a reference doesn't race with
|
| @@ -132,6 +133,11 @@ uint16 SSLConfigService::default_version_max() {
|
| return g_default_version_max;
|
| }
|
|
|
| +// static
|
| +void SSLConfigService::EnableChannelIDTrial() {
|
| + g_channel_id_trial = true;
|
| +}
|
| +
|
| void SSLConfigService::AddObserver(Observer* observer) {
|
| observer_list_.AddObserver(observer);
|
| }
|
| @@ -146,6 +152,8 @@ SSLConfigService::~SSLConfigService() {
|
| // static
|
| void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
|
| ssl_config->cached_info_enabled = g_cached_info_enabled;
|
| + if (g_channel_id_trial)
|
| + ssl_config->channel_id_enabled = true;
|
| }
|
|
|
| void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config,
|
|
|