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

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

Issue 1290243007: Shift URLRequestContextStorage over to taking scoped_ptrs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@Paul_BuilderGrab
Patch Set: Sync'd to revision p349162. Created 5 years, 3 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
« no previous file with comments | « net/http/http_network_layer_unittest.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 5 #include <string>
6 6
7 #include "base/memory/ref_counted.h" 7 #include "base/memory/ref_counted.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "net/base/net_util.h" 10 #include "net/base/net_util.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 58
59 class HttpNetworkTransactionSSLTest : public testing::Test { 59 class HttpNetworkTransactionSSLTest : public testing::Test {
60 protected: 60 protected:
61 void SetUp() override { 61 void SetUp() override {
62 ssl_config_service_ = new TLS10SSLConfigService; 62 ssl_config_service_ = new TLS10SSLConfigService;
63 session_params_.ssl_config_service = ssl_config_service_.get(); 63 session_params_.ssl_config_service = ssl_config_service_.get();
64 64
65 auth_handler_factory_.reset(new HttpAuthHandlerMock::Factory()); 65 auth_handler_factory_.reset(new HttpAuthHandlerMock::Factory());
66 session_params_.http_auth_handler_factory = auth_handler_factory_.get(); 66 session_params_.http_auth_handler_factory = auth_handler_factory_.get();
67 67
68 proxy_service_.reset(ProxyService::CreateDirect()); 68 proxy_service_ = ProxyService::CreateDirect();
69 session_params_.proxy_service = proxy_service_.get(); 69 session_params_.proxy_service = proxy_service_.get();
70 70
71 session_params_.client_socket_factory = &mock_socket_factory_; 71 session_params_.client_socket_factory = &mock_socket_factory_;
72 session_params_.host_resolver = &mock_resolver_; 72 session_params_.host_resolver = &mock_resolver_;
73 session_params_.http_server_properties = 73 session_params_.http_server_properties =
74 http_server_properties_.GetWeakPtr(); 74 http_server_properties_.GetWeakPtr();
75 session_params_.transport_security_state = &transport_security_state_; 75 session_params_.transport_security_state = &transport_security_state_;
76 } 76 }
77 77
78 HttpRequestInfo* GetRequestInfo(const std::string& url) { 78 HttpRequestInfo* GetRequestInfo(const std::string& url) {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 EXPECT_EQ(3u, mock_data.next_index()); 145 EXPECT_EQ(3u, mock_data.next_index());
146 146
147 SSLConfig& ssl_config = GetServerSSLConfig(trans.get()); 147 SSLConfig& ssl_config = GetServerSSLConfig(trans.get());
148 // |version_max| fallbacks to TLS 1.0. 148 // |version_max| fallbacks to TLS 1.0.
149 EXPECT_EQ(SSL_PROTOCOL_VERSION_TLS1, ssl_config.version_max); 149 EXPECT_EQ(SSL_PROTOCOL_VERSION_TLS1, ssl_config.version_max);
150 EXPECT_TRUE(ssl_config.version_fallback); 150 EXPECT_TRUE(ssl_config.version_fallback);
151 } 151 }
152 152
153 } // namespace net 153 } // namespace net
154 154
OLDNEW
« no previous file with comments | « net/http/http_network_layer_unittest.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698