| 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 "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 #include "crypto/nss_util.h" | 7 #include "crypto/nss_util.h" |
| 8 #include "net/base/net_test_suite.h" | |
| 9 #include "net/socket/client_socket_pool_base.h" | 8 #include "net/socket/client_socket_pool_base.h" |
| 10 #include "net/socket/ssl_server_socket.h" | 9 #include "net/socket/ssl_server_socket.h" |
| 11 #include "net/spdy/spdy_session.h" | 10 #include "net/spdy/spdy_session.h" |
| 11 #include "net/test/net_test_suite.h" |
| 12 | 12 |
| 13 #if defined(OS_ANDROID) | 13 #if defined(OS_ANDROID) |
| 14 #include "base/android/jni_android.h" | 14 #include "base/android/jni_android.h" |
| 15 #include "net/android/net_jni_registrar.h" | 15 #include "net/android/net_jni_registrar.h" |
| 16 #endif | 16 #endif |
| 17 | 17 |
| 18 #if !defined(OS_IOS) | 18 #if !defined(OS_IOS) |
| 19 #include "net/proxy/proxy_resolver_v8.h" | 19 #include "net/proxy/proxy_resolver_v8.h" |
| 20 #endif | 20 #endif |
| 21 | 21 |
| (...skipping 22 matching lines...) Expand all Loading... |
| 44 // single-threaded. | 44 // single-threaded. |
| 45 net::EnableSSLServerSockets(); | 45 net::EnableSSLServerSockets(); |
| 46 | 46 |
| 47 #if !defined(OS_IOS) | 47 #if !defined(OS_IOS) |
| 48 // This has to be done on the main thread. | 48 // This has to be done on the main thread. |
| 49 net::ProxyResolverV8::RememberDefaultIsolate(); | 49 net::ProxyResolverV8::RememberDefaultIsolate(); |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 return test_suite.Run(); | 52 return test_suite.Run(); |
| 53 } | 53 } |
| OLD | NEW |