diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 21:13:20 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 21:13:20 +0000 |
| commit | 0c37d9465a5aa01b3efd32a0f1bd5946823d79e8 (patch) | |
| tree | cb30983fecf04edd36833679cfb8d7e0331210b6 /chrome/test | |
| parent | 51575a3a59d91d57598a87e33a38b7fac4c7417c (diff) | |
| download | chromium_src-0c37d9465a5aa01b3efd32a0f1bd5946823d79e8.zip chromium_src-0c37d9465a5aa01b3efd32a0f1bd5946823d79e8.tar.gz chromium_src-0c37d9465a5aa01b3efd32a0f1bd5946823d79e8.tar.bz2 | |
Re-enable basic JS unittests for Chromoting.
This doesn't suffer from the ninja build problems that the first version had.
BUG=none
TEST=ninja chrome; make chrome; make remoting_unittests
Review URL: https://chromiumcodereview.appspot.com/8779002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/base/run_all_remoting_unittests.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/base/run_all_remoting_unittests.cc b/chrome/test/base/run_all_remoting_unittests.cc index efeb178..142d09c 100644 --- a/chrome/test/base/run_all_remoting_unittests.cc +++ b/chrome/test/base/run_all_remoting_unittests.cc @@ -7,15 +7,21 @@ // (required for JS unittests) without updating the DEPS file for each // subproject. - #include "base/test/test_suite.h" #include "chrome/common/chrome_paths.h" +#include "net/socket/ssl_server_socket.h" int main(int argc, char** argv) { base::TestSuite test_suite(argc, argv); +#if defined(OS_MACOSX) || defined(OS_LINUX) // This is required for the JavaScript unittests. chrome::RegisterPathProvider(); +#endif // defined(OS_MACOSX) || defined(OS_LINUX) + + // Enable support for SSL server sockets, which must be done while + // single-threaded. + net::EnableSSLServerSockets(); return test_suite.Run(); } |