| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 #include "base/metrics/histogram.h" | 6 #include "base/metrics/histogram.h" |
| 7 #include "base/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 | 10 |
| 11 using net::internal::ClientSocketPoolBaseHelper; | 11 using net::internal::ClientSocketPoolBaseHelper; |
| 12 | 12 |
| 13 int main(int argc, char** argv) { | 13 int main(int argc, char** argv) { |
| 14 // Record histograms, so we can get histograms data in tests. | 14 // Record histograms, so we can get histograms data in tests. |
| 15 base::StatisticsRecorder recorder; | 15 base::StatisticsRecorder recorder; |
| 16 NetTestSuite test_suite(argc, argv); | 16 NetTestSuite test_suite(argc, argv); |
| 17 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); | 17 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); |
| 18 | 18 |
| 19 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
| 20 // We want to be sure to init NSPR on the main thread. | 20 // We want to be sure to init NSPR on the main thread. |
| 21 base::EnsureNSPRInit(); | 21 crypto::EnsureNSPRInit(); |
| 22 #endif | 22 #endif |
| 23 | 23 |
| 24 return test_suite.Run(); | 24 return test_suite.Run(); |
| 25 } | 25 } |
| OLD | NEW |