| 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" |
| 11 #include "net/spdy/spdy_session.h" | 11 #include "net/spdy/spdy_session.h" |
| 12 #include "net/test/net_test_suite.h" | 12 #include "net/test/net_test_suite.h" |
| 13 #include "url/url_features.h" | 13 #include "url/url_features.h" |
| 14 | 14 |
| 15 #if defined(OS_ANDROID) | 15 #if defined(OS_ANDROID) |
| 16 #include "base/android/jni_android.h" | 16 #include "base/android/jni_android.h" |
| 17 #include "base/android/jni_registrar.h" | 17 #include "base/android/jni_registrar.h" |
| 18 #include "net/android/dummy_spnego_authenticator.h" | 18 #include "net/android/dummy_spnego_authenticator.h" |
| 19 #include "net/android/net_jni_registrar.h" | 19 #include "net/android/net_jni_registrar.h" |
| 20 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) | |
| 21 #include "url/android/url_jni_registrar.h" // nogncheck | |
| 22 #endif | |
| 23 | |
| 24 #endif | 20 #endif |
| 25 | 21 |
| 26 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 22 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 27 #include "mojo/edk/embedder/embedder.h" // nogncheck | 23 #include "mojo/edk/embedder/embedder.h" // nogncheck |
| 28 #endif | 24 #endif |
| 29 | 25 |
| 30 using net::internal::ClientSocketPoolBaseHelper; | 26 using net::internal::ClientSocketPoolBaseHelper; |
| 31 using net::SpdySession; | 27 using net::SpdySession; |
| 32 | 28 |
| 33 int main(int argc, char** argv) { | 29 int main(int argc, char** argv) { |
| 34 // Record histograms, so we can get histograms data in tests. | 30 // Record histograms, so we can get histograms data in tests. |
| 35 base::StatisticsRecorder::Initialize(); | 31 base::StatisticsRecorder::Initialize(); |
| 36 | 32 |
| 37 #if defined(OS_ANDROID) | 33 #if defined(OS_ANDROID) |
| 38 const base::android::RegistrationMethod kNetTestRegisteredMethods[] = { | 34 const base::android::RegistrationMethod kNetTestRegisteredMethods[] = { |
| 39 {"DummySpnegoAuthenticator", | 35 {"DummySpnegoAuthenticator", |
| 40 net::android::DummySpnegoAuthenticator::RegisterJni}, | 36 net::android::DummySpnegoAuthenticator::RegisterJni}, |
| 41 {"NetAndroid", net::android::RegisterJni}, | 37 {"NetAndroid", net::android::RegisterJni}, |
| 42 #if BUILDFLAG(USE_PLATFORM_ICU_ALTERNATIVES) | |
| 43 {"UrlAndroid", url::android::RegisterJni}, | |
| 44 #endif | |
| 45 }; | 38 }; |
| 46 | 39 |
| 47 // Register JNI bindings for android. Doing it early as the test suite setup | 40 // Register JNI bindings for android. Doing it early as the test suite setup |
| 48 // may initiate a call to Java. | 41 // may initiate a call to Java. |
| 49 base::android::RegisterNativeMethods( | 42 base::android::RegisterNativeMethods( |
| 50 base::android::AttachCurrentThread(), | 43 base::android::AttachCurrentThread(), |
| 51 kNetTestRegisteredMethods, | 44 kNetTestRegisteredMethods, |
| 52 arraysize(kNetTestRegisteredMethods)); | 45 arraysize(kNetTestRegisteredMethods)); |
| 53 #endif | 46 #endif |
| 54 | 47 |
| 55 NetTestSuite test_suite(argc, argv); | 48 NetTestSuite test_suite(argc, argv); |
| 56 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); | 49 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); |
| 57 | 50 |
| 58 // Enable support for SSL server sockets, which must be done while | 51 // Enable support for SSL server sockets, which must be done while |
| 59 // single-threaded. | 52 // single-threaded. |
| 60 net::EnableSSLServerSockets(); | 53 net::EnableSSLServerSockets(); |
| 61 | 54 |
| 62 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 55 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
| 63 mojo::edk::Init(); | 56 mojo::edk::Init(); |
| 64 #endif | 57 #endif |
| 65 | 58 |
| 66 return base::LaunchUnitTests( | 59 return base::LaunchUnitTests( |
| 67 argc, argv, base::Bind(&NetTestSuite::Run, | 60 argc, argv, base::Bind(&NetTestSuite::Run, |
| 68 base::Unretained(&test_suite))); | 61 base::Unretained(&test_suite))); |
| 69 } | 62 } |
| OLD | NEW |