diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.gyp | 15 | ||||
| -rw-r--r-- | net/socket/ssl_test_util.h | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/net/net.gyp b/net/net.gyp index 5637f41..c5743d8 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -32,8 +32,6 @@ 'base/cert_database_win.cc', 'base/cert_status_flags.cc', 'base/cert_status_flags.h', - 'base/cert_test_util.cc', - 'base/cert_test_util.h', 'base/cert_verifier.cc', 'base/cert_verifier.h', 'base/cert_verify_result.h', @@ -435,8 +433,6 @@ 'socket/ssl_client_socket_nss.h', 'socket/ssl_client_socket_win.cc', 'socket/ssl_client_socket_win.h', - 'socket/ssl_test_util.cc', - 'socket/ssl_test_util.h', 'socket/tcp_client_socket.h', 'socket/tcp_client_socket_libevent.cc', 'socket/tcp_client_socket_libevent.h', @@ -812,12 +808,23 @@ '../testing/gtest.gyp:gtest', ], 'sources': [ + 'base/cert_test_util.cc', + 'base/cert_test_util.h', 'disk_cache/disk_cache_test_util.cc', 'disk_cache/disk_cache_test_util.h', 'proxy/proxy_config_service_common_unittest.cc', 'proxy/proxy_config_service_common_unittest.h', 'socket/socket_test_util.cc', 'socket/socket_test_util.h', + 'socket/ssl_test_util.cc', + 'socket/ssl_test_util.h', + ], + 'conditions': [ + ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', { + 'dependencies': [ + '../build/linux/system.gyp:nss', + ], + }], ], }, { diff --git a/net/socket/ssl_test_util.h b/net/socket/ssl_test_util.h index e9a6afc..5a987ae 100644 --- a/net/socket/ssl_test_util.h +++ b/net/socket/ssl_test_util.h @@ -16,9 +16,6 @@ #include "net/base/x509_certificate.h" #endif -// TODO(dkegel): share this between net/base and -// chrome/browser without putting it in net.lib - namespace net { // This object bounds the lifetime of an external python-based HTTP/HTTPS/FTP |