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

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

Issue 135373002: Added SSLHostInfo. Storing of server host info to our standard disk cache. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with TOT Created 6 years, 11 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) 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 "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/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 &tcp_histograms_, 70 &tcp_histograms_,
71 session_deps_.deterministic_socket_factory.get()), 71 session_deps_.deterministic_socket_factory.get()),
72 ssl_histograms_("MockSSL"), 72 ssl_histograms_("MockSSL"),
73 ssl_socket_pool_(kMaxSockets, 73 ssl_socket_pool_(kMaxSockets,
74 kMaxSocketsPerGroup, 74 kMaxSocketsPerGroup,
75 &ssl_histograms_, 75 &ssl_histograms_,
76 session_deps_.host_resolver.get(), 76 session_deps_.host_resolver.get(),
77 session_deps_.cert_verifier.get(), 77 session_deps_.cert_verifier.get(),
78 NULL /* server_bound_cert_store */, 78 NULL /* server_bound_cert_store */,
79 NULL /* transport_security_state */, 79 NULL /* transport_security_state */,
80 NULL /* ssl_host_info_factory */,
80 NULL /* cert_transparency_verifier */, 81 NULL /* cert_transparency_verifier */,
wtc 2014/01/15 19:08:59 Reverse these two arguments, to match the argument
ramant (doing other things) 2014/01/18 00:21:56 Done.
81 std::string() /* ssl_session_cache_shard */, 82 std::string() /* ssl_session_cache_shard */,
82 session_deps_.deterministic_socket_factory.get(), 83 session_deps_.deterministic_socket_factory.get(),
83 &transport_socket_pool_, 84 &transport_socket_pool_,
84 NULL, 85 NULL,
85 NULL, 86 NULL,
86 session_deps_.ssl_config_service.get(), 87 session_deps_.ssl_config_service.get(),
87 BoundNetLog().net_log()), 88 BoundNetLog().net_log()),
88 session_(CreateNetworkSession()), 89 session_(CreateNetworkSession()),
89 http_proxy_histograms_("HttpProxyUnitTest"), 90 http_proxy_histograms_("HttpProxyUnitTest"),
90 spdy_util_(GetParam().protocol), 91 spdy_util_(GetParam().protocol),
(...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 EXPECT_TRUE(headers->IsRedirect(&location)); 726 EXPECT_TRUE(headers->IsRedirect(&location));
726 EXPECT_EQ(location, redirectTarget); 727 EXPECT_EQ(location, redirectTarget);
727 } 728 }
728 } 729 }
729 730
730 // It would be nice to also test the timeouts in HttpProxyClientSocketPool. 731 // It would be nice to also test the timeouts in HttpProxyClientSocketPool.
731 732
732 } // namespace 733 } // namespace
733 734
734 } // namespace net 735 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698