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 "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/spdy/spdy_session.h" |
10 | 11 |
11 using net::internal::ClientSocketPoolBaseHelper; | 12 using net::internal::ClientSocketPoolBaseHelper; |
| 13 using net::SpdySession; |
12 | 14 |
13 int main(int argc, char** argv) { | 15 int main(int argc, char** argv) { |
14 // Record histograms, so we can get histograms data in tests. | 16 // Record histograms, so we can get histograms data in tests. |
15 base::StatisticsRecorder recorder; | 17 base::StatisticsRecorder recorder; |
16 NetTestSuite test_suite(argc, argv); | 18 NetTestSuite test_suite(argc, argv); |
17 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); | 19 ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); |
| 20 SpdySession::set_enable_ping_based_connection_checking(false); |
18 | 21 |
19 #if defined(OS_WIN) | 22 #if defined(OS_WIN) |
20 // We want to be sure to init NSPR on the main thread. | 23 // We want to be sure to init NSPR on the main thread. |
21 crypto::EnsureNSPRInit(); | 24 crypto::EnsureNSPRInit(); |
22 #endif | 25 #endif |
23 | 26 |
24 return test_suite.Run(); | 27 return test_suite.Run(); |
25 } | 28 } |
OLD | NEW |