diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 16:21:28 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-06 16:21:28 +0000 |
| commit | d0bd90e151316a236b59e878be5dd00b78cd0f82 (patch) | |
| tree | 65de31ce50adf4bf5246638b76f03b2e76f45fbb /net | |
| parent | 9fa5c08f52cc55a7de5554e9280807ab42e94219 (diff) | |
| download | chromium_src-d0bd90e151316a236b59e878be5dd00b78cd0f82.zip chromium_src-d0bd90e151316a236b59e878be5dd00b78cd0f82.tar.gz chromium_src-d0bd90e151316a236b59e878be5dd00b78cd0f82.tar.bz2 | |
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
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/ssl_config_service.cc | 16 | ||||
| -rw-r--r-- | net/net.gyp | 6 |
2 files changed, 3 insertions, 19 deletions
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 diff --git a/net/net.gyp b/net/net.gyp index 0fc51ce..c2e68c5 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -181,10 +181,6 @@ 'base/ssl_config_service.h', 'base/ssl_config_service_defaults.cc', 'base/ssl_config_service_defaults.h', - 'base/ssl_config_service_mac.cc', - 'base/ssl_config_service_mac.h', - 'base/ssl_config_service_win.cc', - 'base/ssl_config_service_win.h', 'base/ssl_false_start_blacklist.cc', 'base/ssl_info.cc', 'base/ssl_info.h', @@ -910,9 +906,7 @@ 'base/sdch_filter_unittest.cc', 'base/ssl_cipher_suite_names_unittest.cc', 'base/ssl_client_auth_cache_unittest.cc', - 'base/ssl_config_service_mac_unittest.cc', 'base/ssl_config_service_unittest.cc', - 'base/ssl_config_service_win_unittest.cc', 'base/ssl_false_start_blacklist_unittest.cc', 'base/static_cookie_policy_unittest.cc', 'base/transport_security_state_unittest.cc', |