Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Side by Side Diff: net/http/http_proxy_client_socket_pool_unittest.cc

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "net/http/http_proxy_client_socket_pool.h" 5 #include "net/http/http_proxy_client_socket_pool.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 kMaxSockets, kMaxSocketsPerGroup, 59 kMaxSockets, kMaxSocketsPerGroup,
60 &tcp_histograms_, 60 &tcp_histograms_,
61 &socket_factory_), 61 &socket_factory_),
62 ssl_histograms_("MockSSL"), 62 ssl_histograms_("MockSSL"),
63 ssl_config_service_(new SSLConfigServiceDefaults), 63 ssl_config_service_(new SSLConfigServiceDefaults),
64 host_resolver_(new MockHostResolver), 64 host_resolver_(new MockHostResolver),
65 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup, 65 ssl_socket_pool_(kMaxSockets, kMaxSocketsPerGroup,
66 &ssl_histograms_, 66 &ssl_histograms_,
67 host_resolver_.get(), 67 host_resolver_.get(),
68 NULL /* dnsrr_resolver */, 68 NULL /* dnsrr_resolver */,
69 NULL /* ssl_host_info_factory */,
70 &socket_factory_, 69 &socket_factory_,
71 &tcp_socket_pool_, 70 &tcp_socket_pool_,
72 NULL, 71 NULL,
73 NULL, 72 NULL,
74 ssl_config_service_.get(), 73 ssl_config_service_.get(),
75 BoundNetLog().net_log()), 74 BoundNetLog().net_log()),
76 http_auth_handler_factory_( 75 http_auth_handler_factory_(
77 HttpAuthHandlerFactory::CreateDefault(host_resolver_.get())), 76 HttpAuthHandlerFactory::CreateDefault(host_resolver_.get())),
78 session_(new HttpNetworkSession(host_resolver_.get(), 77 session_(new HttpNetworkSession(host_resolver_.get(),
79 NULL /* dnsrr_resolver */, 78 NULL /* dnsrr_resolver */,
80 NULL /* ssl_host_info_factory */,
81 ProxyService::CreateDirect(), 79 ProxyService::CreateDirect(),
82 &socket_factory_, 80 &socket_factory_,
83 new SSLConfigServiceDefaults, 81 new SSLConfigServiceDefaults,
84 new SpdySessionPool(NULL), 82 new SpdySessionPool(NULL),
85 http_auth_handler_factory_.get(), 83 http_auth_handler_factory_.get(),
86 NULL, 84 NULL,
87 NULL)), 85 NULL)),
88 http_proxy_histograms_("HttpProxyUnitTest"), 86 http_proxy_histograms_("HttpProxyUnitTest"),
89 ssl_data_(NULL), 87 ssl_data_(NULL),
90 data_(NULL), 88 data_(NULL),
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 data_->RunFor(2); 494 data_->RunFor(2);
497 495
498 EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, callback_.WaitForResult()); 496 EXPECT_EQ(ERR_TUNNEL_CONNECTION_FAILED, callback_.WaitForResult());
499 EXPECT_FALSE(handle_.is_initialized()); 497 EXPECT_FALSE(handle_.is_initialized());
500 EXPECT_FALSE(handle_.socket()); 498 EXPECT_FALSE(handle_.socket());
501 } 499 }
502 500
503 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. 501 // It would be nice to also test the timeouts in HttpProxyClientSocketPool.
504 502
505 } // namespace net 503 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | net/http/http_response_body_drainer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698