net/http/http_network_transaction_ssl_unittest.cc - Issue 2041863002: Remove HttpServerProperies::GetWeakPtr().

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

Issue 2041863002: Remove HttpServerProperies::GetWeakPtr(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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

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 <memory>	5 #include <memory>

6 #include <string>	6 #include <string>

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/memory/ptr_util.h"	9 #include "base/memory/ptr_util.h"

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

(...skipping 67 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
78 session_params_.ssl_config_service = ssl_config_service_.get();	78 session_params_.ssl_config_service = ssl_config_service_.get();

79	79

80 auth_handler_factory_.reset(new HttpAuthHandlerMock::Factory());	80 auth_handler_factory_.reset(new HttpAuthHandlerMock::Factory());

81 session_params_.http_auth_handler_factory = auth_handler_factory_.get();	81 session_params_.http_auth_handler_factory = auth_handler_factory_.get();

82	82

83 proxy_service_ = ProxyService::CreateDirect();	83 proxy_service_ = ProxyService::CreateDirect();

84 session_params_.proxy_service = proxy_service_.get();	84 session_params_.proxy_service = proxy_service_.get();

85	85

86 session_params_.client_socket_factory = &mock_socket_factory_;	86 session_params_.client_socket_factory = &mock_socket_factory_;

87 session_params_.host_resolver = &mock_resolver_;	87 session_params_.host_resolver = &mock_resolver_;

88 session_params_.http_server_properties =	88 session_params_.http_server_properties = &http_server_properties_;

89 http_server_properties_.GetWeakPtr();

90 session_params_.transport_security_state = &transport_security_state_;	89 session_params_.transport_security_state = &transport_security_state_;

91 }	90 }

92	91

93 HttpRequestInfo* GetRequestInfo(const std::string& url) {	92 HttpRequestInfo* GetRequestInfo(const std::string& url) {

94 HttpRequestInfo* request_info = new HttpRequestInfo;	93 HttpRequestInfo* request_info = new HttpRequestInfo;

95 request_info->url = GURL(url);	94 request_info->url = GURL(url);

96 request_info->method = "GET";	95 request_info->method = "GET";

97 request_info_vector_.push_back(base::WrapUnique(request_info));	96 request_info_vector_.push_back(base::WrapUnique(request_info));

98 return request_info;	97 return request_info;

99 }	98 }

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
235	234

236 HttpRequestHeaders headers;	235 HttpRequestHeaders headers;

237 ASSERT_TRUE(trans.GetFullRequestHeaders(&headers));	236 ASSERT_TRUE(trans.GetFullRequestHeaders(&headers));

238 std::string token_binding_header;	237 std::string token_binding_header;

239 EXPECT_FALSE(headers.GetHeader(HttpRequestHeaders::kTokenBinding,	238 EXPECT_FALSE(headers.GetHeader(HttpRequestHeaders::kTokenBinding,

240 &token_binding_header));	239 &token_binding_header));

241 }	240 }

242 #endif // !defined(OS_IOS)	241 #endif // !defined(OS_IOS)

243	242

244 } // namespace net	243 } // namespace net

OLD	NEW

« no previous file with comments | « net/http/http_network_session.h ('k') | net/http/http_network_transaction_unittest.cc » ('j') | net/spdy/spdy_session.h » ('J')