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

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

Issue 16501002: Give more request types a TransportSecurityState. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar call sites. Created 7 years, 6 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_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <math.h> // ceil 7 #include <math.h> // ceil
8 #include <stdarg.h> 8 #include <stdarg.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 8816 matching lines...) Expand 10 before | Expand all | Expand 10 after
8827 session->GetTransportSocketPool( 8827 session->GetTransportSocketPool(
8828 HttpNetworkSession::NORMAL_SOCKET_POOL), 8828 HttpNetworkSession::NORMAL_SOCKET_POOL),
8829 BoundNetLog())); 8829 BoundNetLog()));
8830 EXPECT_EQ(OK, callback.WaitForResult()); 8830 EXPECT_EQ(OK, callback.WaitForResult());
8831 8831
8832 SSLConfig ssl_config; 8832 SSLConfig ssl_config;
8833 session->ssl_config_service()->GetSSLConfig(&ssl_config); 8833 session->ssl_config_service()->GetSSLConfig(&ssl_config);
8834 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle); 8834 scoped_ptr<ClientSocketHandle> ssl_connection(new ClientSocketHandle);
8835 SSLClientSocketContext context; 8835 SSLClientSocketContext context;
8836 context.cert_verifier = session_deps_.cert_verifier.get(); 8836 context.cert_verifier = session_deps_.cert_verifier.get();
8837 context.transport_security_state =
8838 session_deps_.transport_security_state.get();
8837 ssl_connection->set_socket( 8839 ssl_connection->set_socket(
8838 session_deps_.socket_factory->CreateSSLClientSocket( 8840 session_deps_.socket_factory->CreateSSLClientSocket(
8839 connection.release(), 8841 connection.release(),
8840 HostPortPair(std::string(), 443), 8842 HostPortPair(std::string(), 443),
8841 ssl_config, 8843 ssl_config,
8842 context)); 8844 context));
8843 EXPECT_EQ(ERR_IO_PENDING, 8845 EXPECT_EQ(ERR_IO_PENDING,
8844 ssl_connection->socket()->Connect(callback.callback())); 8846 ssl_connection->socket()->Connect(callback.callback()));
8845 EXPECT_EQ(OK, callback.WaitForResult()); 8847 EXPECT_EQ(OK, callback.WaitForResult());
8846 8848
(...skipping 2545 matching lines...) Expand 10 before | Expand all | Expand 10 after
11392 EXPECT_EQ("hello!", response_data); 11394 EXPECT_EQ("hello!", response_data);
11393 EXPECT_FALSE( 11395 EXPECT_FALSE(
11394 session->spdy_session_pool()->HasSession(spdy_session_key_a)); 11396 session->spdy_session_pool()->HasSession(spdy_session_key_a));
11395 EXPECT_FALSE( 11397 EXPECT_FALSE(
11396 session->spdy_session_pool()->HasSession(spdy_session_key_b)); 11398 session->spdy_session_pool()->HasSession(spdy_session_key_b));
11397 11399
11398 HttpStreamFactory::SetNextProtos(std::vector<std::string>()); 11400 HttpStreamFactory::SetNextProtos(std::vector<std::string>());
11399 } 11401 }
11400 11402
11401 } // namespace net 11403 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698