| 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 "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/socket/ssl_server_socket.h" | 
| 10 #include "net/spdy/spdy_session.h" | 11 #include "net/spdy/spdy_session.h" | 
| 11 | 12 | 
| 12 using net::internal::ClientSocketPoolBaseHelper; | 13 using net::internal::ClientSocketPoolBaseHelper; | 
| 13 using net::SpdySession; | 14 using net::SpdySession; | 
| 14 | 15 | 
| 15 int main(int argc, char** argv) { | 16 int main(int argc, char** argv) { | 
| 16   // Record histograms, so we can get histograms data in tests. | 17   // Record histograms, so we can get histograms data in tests. | 
| 17   base::StatisticsRecorder recorder; | 18   base::StatisticsRecorder recorder; | 
| 18   NetTestSuite test_suite(argc, argv); | 19   NetTestSuite test_suite(argc, argv); | 
| 19   ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); | 20   ClientSocketPoolBaseHelper::set_connect_backup_jobs_enabled(false); | 
| 20 | 21 | 
| 21 #if defined(OS_WIN) | 22 #if defined(OS_WIN) | 
| 22   // 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. | 
| 23   crypto::EnsureNSPRInit(); | 24   crypto::EnsureNSPRInit(); | 
| 24 #endif | 25 #endif | 
| 25 | 26 | 
|  | 27   // Enable support for SSL server sockets, which must be done while | 
|  | 28   // single-threaded. | 
|  | 29   net::EnableSSLServerSockets(); | 
|  | 30 | 
| 26   return test_suite.Run(); | 31   return test_suite.Run(); | 
| 27 } | 32 } | 
| OLD | NEW | 
|---|