OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "base/metrics/statistics_recorder.h" | 5 #include "base/metrics/statistics_recorder.h" |
6 #include "base/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "crypto/nss_util.h" | 8 #include "crypto/nss_util.h" |
9 #include "net/socket/client_socket_pool_base.h" | 9 #include "net/socket/client_socket_pool_base.h" |
10 #include "net/socket/ssl_server_socket.h" | 10 #include "net/socket/ssl_server_socket.h" |
(...skipping 30 matching lines...) Expand all Loading... |
41 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
42 // We want to be sure to init NSPR on the main thread. | 42 // We want to be sure to init NSPR on the main thread. |
43 crypto::EnsureNSPRInit(); | 43 crypto::EnsureNSPRInit(); |
44 #endif | 44 #endif |
45 | 45 |
46 // Enable support for SSL server sockets, which must be done while | 46 // Enable support for SSL server sockets, which must be done while |
47 // single-threaded. | 47 // single-threaded. |
48 net::EnableSSLServerSockets(); | 48 net::EnableSSLServerSockets(); |
49 | 49 |
50 #if !defined(OS_IOS) | 50 #if !defined(OS_IOS) |
51 // This has to be done on the main thread. | 51 net::ProxyResolverV8::EnsureIsolateCreated(); |
52 net::ProxyResolverV8::RememberDefaultIsolate(); | |
53 #endif | 52 #endif |
54 | 53 |
55 return base::LaunchUnitTests( | 54 return base::LaunchUnitTests( |
56 argc, argv, base::Bind(&NetTestSuite::Run, | 55 argc, argv, base::Bind(&NetTestSuite::Run, |
57 base::Unretained(&test_suite))); | 56 base::Unretained(&test_suite))); |
58 } | 57 } |
OLD | NEW |