diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 21:48:42 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-19 21:48:42 +0000 |
| commit | db36938cb26cf265a5fd93690a8e783d01406958 (patch) | |
| tree | 7261d389592cdfbbb3063f223455518db12d3bda /net/net.gyp | |
| parent | 0d1872ebba9b790f3a33bcaecc11258ea924b397 (diff) | |
| download | chromium_src-db36938cb26cf265a5fd93690a8e783d01406958.zip chromium_src-db36938cb26cf265a5fd93690a8e783d01406958.tar.gz chromium_src-db36938cb26cf265a5fd93690a8e783d01406958.tar.bz2 | |
Pref-backed SSLConfigService for Linux.
Makes SSLConfigService into a ref-counted interface, and makes Profile own an SSLConfigServiceFactory which is used to create the SSLConfigService and pass it through the URLRequestContext on down to where it is actually used.
R=eroman,wtc
BUG=11507,19290
Review URL: http://codereview.chromium.org/165003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/net/net.gyp b/net/net.gyp index 0680f4c..b373722 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -121,8 +121,10 @@ 'base/ssl_cert_request_info.h', 'base/ssl_client_auth_cache.cc', 'base/ssl_client_auth_cache.h', - 'base/ssl_config_service.cc', 'base/ssl_config_service.h', + 'base/ssl_config_service_defaults.h', + 'base/ssl_config_service_win.cc', + 'base/ssl_config_service_win.h', 'base/ssl_info.h', 'base/telnet_server.cc', 'base/telnet_server.h', @@ -390,7 +392,6 @@ }, { # else: OS != "win" 'sources!': [ - 'base/ssl_config_service.cc', 'base/wininet_util.cc', 'base/winsock_init.cc', 'proxy/proxy_resolver_winhttp.cc', @@ -471,7 +472,7 @@ 'base/run_all_unittests.cc', 'base/sdch_filter_unittest.cc', 'base/ssl_client_auth_cache_unittest.cc', - 'base/ssl_config_service_unittest.cc', + 'base/ssl_config_service_win_unittest.cc', 'base/telnet_server_unittest.cc', 'base/test_completion_callback_unittest.cc', 'base/wininet_util_unittest.cc', @@ -543,15 +544,11 @@ ], 'sources!': [ 'base/sdch_filter_unittest.cc', - 'base/ssl_config_service_unittest.cc', ], }, ], [ 'OS == "mac"', { 'sources/': [ ['exclude', '_(linux|win)_unittest\\.cc$'] ], - 'sources!': [ - 'base/ssl_config_service_unittest.cc', - ], }, ], # This is needed to trigger the dll copy step on windows. |