diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 18:24:51 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 18:24:51 +0000 |
| commit | 702a6a7200da7a1c3c9bc03d19cd7a1f7740e157 (patch) | |
| tree | 688929d21270b6ac4b5a858e631f25ed220f9888 /webkit | |
| parent | 4ac582aeccbc08f8304c8fb5491b882ab7f97e8f (diff) | |
| download | chromium_src-702a6a7200da7a1c3c9bc03d19cd7a1f7740e157.zip chromium_src-702a6a7200da7a1c3c9bc03d19cd7a1f7740e157.tar.gz chromium_src-702a6a7200da7a1c3c9bc03d19cd7a1f7740e157.tar.bz2 | |
Move cert_test_util.{h,cc} and ssl_test_util.{h,cc} to the
net_test_support build target.
R=eroman
BUG=none
TEST=no build errors
Review URL: http://codereview.chromium.org/1047003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/test_shell.gypi | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_main.cc | 2 |
2 files changed, 3 insertions, 1 deletions
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(); |