Remove vestigal traces of the TLS Cached Info Extension support

Chrome no longer carries the patch to NSS to enable this support; remove the
traces that exist in Chrome to support it.

BUG=none
R=wtc
TBR=brettw

Review URL: https://codereview.chromium.org/122573004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244285 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 0 insertions, 27 deletions

diff --git a/net/ssl/ssl_config_service.cc b/net/ssl/ssl_config_service.cc
index a28c46d..ec9fcc3 100644
--- a/net/ssl/ssl_config_service.cc
+++ b/net/ssl/ssl_config_service.cc
@@ -40,7 +40,6 @@ SSLConfig::SSLConfig()
       rev_checking_required_local_anchors(false),
       version_min(g_default_version_min),
       version_max(g_default_version_max),
-      cached_info_enabled(false),
       channel_id_enabled(true),
       false_start_enabled(true),
       signed_cert_timestamps_enabled(true),
@@ -79,8 +78,6 @@ SSLConfigService::SSLConfigService()
     : observer_list_(ObserverList<Observer>::NOTIFY_EXISTING_ONLY) {
 }
 
-static bool g_cached_info_enabled = 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
 // updating the CRLSet.
@@ -114,15 +111,6 @@ scoped_refptr<CRLSet> SSLConfigService::GetCRLSet() {
   return g_crl_set.Get().Get();
 }
 
-void SSLConfigService::EnableCachedInfo() {
-  g_cached_info_enabled = true;
-}
-
-// static
-bool SSLConfigService::cached_info_enabled() {
-  return g_cached_info_enabled;
-}
-
 // static
 uint16 SSLConfigService::default_version_min() {
   return g_default_version_min;
@@ -148,11 +136,6 @@ void SSLConfigService::NotifySSLConfigChange() {
 SSLConfigService::~SSLConfigService() {
 }
 
-// static
-void SSLConfigService::SetSSLConfigFlags(SSLConfig* ssl_config) {
-  ssl_config->cached_info_enabled = g_cached_info_enabled;
-}
-
 void SSLConfigService::ProcessConfigUpdate(const SSLConfig& orig_config,
                                            const SSLConfig& new_config) {
   bool config_changed =
diff --git a/net/ssl/ssl_config_service.h b/net/ssl/ssl_config_service.h
index 0b19e30..08a59fd 100644
--- a/net/ssl/ssl_config_service.h
+++ b/net/ssl/ssl_config_service.h
@@ -96,7 +96,6 @@ struct NET_EXPORT SSLConfig {
   // disable TLS_ECDH_ECDSA_WITH_RC4_128_SHA, specify 0xC002.
   std::vector<uint16> disabled_cipher_suites;
 
-  bool cached_info_enabled;  // True if TLS cached info extension is enabled.
   bool channel_id_enabled;   // True if TLS channel ID extension is enabled.
   bool false_start_enabled;  // True if we'll use TLS False Start.
   // True if the Certificate Transparency signed_certificate_timestamp
@@ -194,11 +193,6 @@ class NET_EXPORT SSLConfigService
   static void SetCRLSet(scoped_refptr<CRLSet> crl_set);
   static scoped_refptr<CRLSet> GetCRLSet();
 
-  // Enables the TLS cached info extension, which allows the server to send
-  // just a digest of its certificate chain.
-  static void EnableCachedInfo();
-  static bool cached_info_enabled();
-
   // Gets the default minimum protocol version.
   static uint16 default_version_min();
 
@@ -223,9 +217,6 @@ class NET_EXPORT SSLConfigService
 
   virtual ~SSLConfigService();
 
-  // SetFlags sets the values of several flags based on global configuration.
-  static void SetSSLConfigFlags(SSLConfig* ssl_config);
-
   // Process before/after config update.
   void ProcessConfigUpdate(const SSLConfig& orig_config,
                            const SSLConfig& new_config);
diff --git a/net/ssl/ssl_config_service_defaults.cc b/net/ssl/ssl_config_service_defaults.cc
index 1d96977..c512ed8 100644
--- a/net/ssl/ssl_config_service_defaults.cc
+++ b/net/ssl/ssl_config_service_defaults.cc
@@ -11,7 +11,6 @@ SSLConfigServiceDefaults::SSLConfigServiceDefaults() {
 
 void SSLConfigServiceDefaults::GetSSLConfig(SSLConfig* config) {
   *config = default_config_;
-  SetSSLConfigFlags(config);
 }
 
 SSLConfigServiceDefaults::~SSLConfigServiceDefaults() {