diff options
| -rw-r--r-- | chrome/chrome_tests.gypi | 3 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.gypi | 1 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 1 | ||||
| -rw-r--r-- | net/net.gyp | 15 | ||||
| -rw-r--r-- | net/socket/ssl_test_util.h | 3 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 2 |
7 files changed, 19 insertions, 8 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0d6f07d..5d9446d 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -258,6 +258,7 @@ 'test_support_ui', '../base/base.gyp:base', '../net/net.gyp:net', + '../net/net.gyp:net_test_support', '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', @@ -1159,6 +1160,7 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', + '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', @@ -1675,6 +1677,7 @@ 'chrome_strings', 'syncapi', 'test_support_unit', + '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi index 5da48d0..1b993be 100644 --- a/chrome/test/interactive_ui/interactive_ui_tests.gypi +++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi @@ -12,6 +12,7 @@ '<(DEPTH)/chrome/chrome.gyp:syncapi', '<(DEPTH)/third_party/hunspell/hunspell.gyp:hunspell', '<(DEPTH)/net/net.gyp:net_resources', + '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index e589881..a62333d 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -183,6 +183,7 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/chrome.gyp:common', '../chrome/chrome.gyp:utility', + '../net/net.gyp:net_test_support', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/libxml/libxml.gyp:libxml', 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 diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi index ef02fb3..46e4806 100644 --- a/webkit/tools/test_shell/test_shell.gypi +++ b/webkit/tools/test_shell/test_shell.gypi @@ -235,6 +235,7 @@ 'msvs_guid': 'FA39524D-3067-4141-888D-28A86C66F2B9', 'dependencies': [ 'test_shell_common', + '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/tools/imagediff/image_diff.gyp:image_diff', ], 'defines': [ @@ -363,6 +364,7 @@ 'msvs_guid': 'E6766F81-1FCD-4CD7-BC16-E36964A14867', 'dependencies': [ 'test_shell_common', + '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/skia/skia.gyp:skia', '<(DEPTH)/testing/gmock.gyp:gmock', '<(DEPTH)/testing/gtest.gyp:gtest', diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc index 4fb0818..ee194a5 100644 --- a/webkit/tools/test_shell/test_shell_main.cc +++ b/webkit/tools/test_shell/test_shell_main.cc @@ -165,7 +165,7 @@ int main(int argc, char* argv[]) { // Config the network module so it has access to a limited set of resources. net::NetModule::SetResourceProvider(TestShell::NetResourceProvider); - // On Linux, load the test root certificate. + // On Linux and Mac, load the test root certificate. net::TestServerLauncher ssl_util; ssl_util.LoadTestRootCert(); |