| 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" | 8 #include "net/base/net_test_suite.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 | 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 using net::internal::ClientSocketPoolBaseHelper; | 18 using net::internal::ClientSocketPoolBaseHelper; |
| 19 using net::SpdySession; | 19 using net::SpdySession; |
| 20 | 20 |
| 21 int main(int argc, char** argv) { | 21 int main(int argc, char** argv) { |
| 22 // Record histograms, so we can get histograms data in tests. | 22 // Record histograms, so we can get histograms data in tests. |
| 23 base::StatisticsRecorder recorder; | 23 base::StatisticsRecorder::Initialize(); |
| 24 | 24 |
| 25 #if defined(OS_ANDROID) | 25 #if defined(OS_ANDROID) |
| 26 // Register JNI bindings for android. Doing it early as the test suite setup | 26 // Register JNI bindings for android. Doing it early as the test suite setup |
| 27 // may initiate a call to Java. | 27 // may initiate a call to Java. |
| 28 net::android::RegisterJni(base::android::AttachCurrentThread()); | 28 net::android::RegisterJni(base::android::AttachCurrentThread()); |
| 29 #endif | 29 #endif |
| 30 | 30 |
| 31 NetTestSuite test_suite(argc, argv); | 31 NetTestSuite test_suite(argc, argv); |
| 32 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); | 32 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); |
| 33 | 33 |
| 34 #if defined(OS_WIN) | 34 #if defined(OS_WIN) |
| 35 // We want to be sure to init NSPR on the main thread. | 35 // We want to be sure to init NSPR on the main thread. |
| 36 crypto::EnsureNSPRInit(); | 36 crypto::EnsureNSPRInit(); |
| 37 #endif | 37 #endif |
| 38 | 38 |
| 39 // Enable support for SSL server sockets, which must be done while | 39 // Enable support for SSL server sockets, which must be done while |
| 40 // single-threaded. | 40 // single-threaded. |
| 41 net::EnableSSLServerSockets(); | 41 net::EnableSSLServerSockets(); |
| 42 | 42 |
| 43 return test_suite.Run(); | 43 return test_suite.Run(); |
| 44 } | 44 } |
| OLD | NEW |