From d0bd90e151316a236b59e878be5dd00b78cd0f82 Mon Sep 17 00:00:00 2001 From: "rtenneti@chromium.org" Date: Wed, 6 Apr 2011 16:21:28 +0000 Subject: Read and Write SSL3, TLS1 and Cert revocation SSL preferences from local_state on Windows and Mac. BUG=76551 TEST=testing SSL preferences with options UI R=wtc Review URL: http://codereview.chromium.org/6693077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80635 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/ssl_config_service.cc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'net/base') diff --git a/net/base/ssl_config_service.cc b/net/base/ssl_config_service.cc index 55b8f06..a526bc0 100644 --- a/net/base/ssl_config_service.cc +++ b/net/base/ssl_config_service.cc @@ -3,15 +3,9 @@ // found in the LICENSE file. #include "net/base/ssl_config_service.h" -#include "net/base/ssl_false_start_blacklist.h" -#if defined(OS_WIN) -#include "net/base/ssl_config_service_win.h" -#elif defined(OS_MACOSX) -#include "net/base/ssl_config_service_mac.h" -#else #include "net/base/ssl_config_service_defaults.h" -#endif +#include "net/base/ssl_false_start_blacklist.h" namespace net { @@ -44,13 +38,9 @@ SSLConfigService::SSLConfigService() // static SSLConfigService* SSLConfigService::CreateSystemSSLConfigService() { -#if defined(OS_WIN) - return new SSLConfigServiceWin; -#elif defined(OS_MACOSX) - return new SSLConfigServiceMac; -#else + // TODO(rtenneti): We don't use the system SSL configuration any more. + // Simplify this code after talking with mattm. return new SSLConfigServiceDefaults; -#endif } // static -- cgit v1.1