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/unit_test_launcher.h" |
6 #include "build/build_config.h" | 7 #include "build/build_config.h" |
7 #include "crypto/nss_util.h" | 8 #include "crypto/nss_util.h" |
8 #include "net/socket/client_socket_pool_base.h" | 9 #include "net/socket/client_socket_pool_base.h" |
9 #include "net/socket/ssl_server_socket.h" | 10 #include "net/socket/ssl_server_socket.h" |
10 #include "net/spdy/spdy_session.h" | 11 #include "net/spdy/spdy_session.h" |
11 #include "net/test/net_test_suite.h" | 12 #include "net/test/net_test_suite.h" |
12 | 13 |
13 #if defined(OS_ANDROID) | 14 #if defined(OS_ANDROID) |
14 #include "base/android/jni_android.h" | 15 #include "base/android/jni_android.h" |
15 #include "net/android/net_jni_registrar.h" | 16 #include "net/android/net_jni_registrar.h" |
(...skipping 26 matching lines...) Expand all Loading... |
42 | 43 |
43 // Enable support for SSL server sockets, which must be done while | 44 // Enable support for SSL server sockets, which must be done while |
44 // single-threaded. | 45 // single-threaded. |
45 net::EnableSSLServerSockets(); | 46 net::EnableSSLServerSockets(); |
46 | 47 |
47 #if !defined(OS_IOS) | 48 #if !defined(OS_IOS) |
48 // This has to be done on the main thread. | 49 // This has to be done on the main thread. |
49 net::ProxyResolverV8::RememberDefaultIsolate(); | 50 net::ProxyResolverV8::RememberDefaultIsolate(); |
50 #endif | 51 #endif |
51 | 52 |
52 return test_suite.Run(); | 53 return base::LaunchUnitTests( |
| 54 argc, argv, base::Bind(&NetTestSuite::Run, |
| 55 base::Unretained(&test_suite))); |
53 } | 56 } |
OLD | NEW |