diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:04:08 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:04:08 +0000 |
| commit | 3c866028f84daada4eb964742a2a331876fbd5a1 (patch) | |
| tree | a84084fc10a7677e4262f1f427cc7589fc3b7947 /net/base | |
| parent | 4e35daf812bc83685f3a06b8658ca9bb9e86da7d (diff) | |
| download | chromium_src-3c866028f84daada4eb964742a2a331876fbd5a1.zip chromium_src-3c866028f84daada4eb964742a2a331876fbd5a1.tar.gz chromium_src-3c866028f84daada4eb964742a2a331876fbd5a1.tar.bz2 | |
Revert "TLS channel id field trial."
This reverts commit 145978.
BUG=136462,142388
TBR=rch@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10826284
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
| -rw-r--r-- | net/base/ssl_config_service.cc | 8 | ||||
| -rw-r--r-- | net/base/ssl_config_service.h | 3 |
2 files changed, 0 insertions, 11 deletions
diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc index 94fa84c..2dbee56 100644 --- a/net/base/ssl_config_service.cc +++ b/net/base/ssl_config_service.cc @@ -65,7 +65,6 @@ 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 @@ -124,11 +123,6 @@ 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); } @@ -143,8 +137,6 @@ 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, diff --git a/net/base/ssl_config_service.h b/net/base/ssl_config_service.h index 4ad882b..de430e1 100644 --- a/net/base/ssl_config_service.h +++ b/net/base/ssl_config_service.h @@ -180,9 +180,6 @@ class NET_EXPORT SSLConfigService static void SetDefaultVersionMax(uint16 version_max); static uint16 default_version_max(); - // Force channel ID support to be enabled. - static void EnableChannelIDTrial(); - // Is SNI available in this configuration? static bool IsSNIAvailable(SSLConfigService* service); |