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

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

Issue 2906463002: Make HttpNetworkSession::host_mapping_rules no longer a pointer. (Closed)
Patch Set: More upstream merge conflicts! Fun! Created 3 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
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_stream_factory_impl_job_controller.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 "net/http/http_stream_factory_impl.h" 5 #include "net/http/http_stream_factory_impl.h"
6 6
7 #include <string> 7 #include <string>
8 #include <tuple> 8 #include <tuple>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 /* is_preconnect = */ true, 212 /* is_preconnect = */ true,
213 /* enable_ip_based_pooling = */ true, 213 /* enable_ip_based_pooling = */ true,
214 /* enable_alternative_services = */ true); 214 /* enable_alternative_services = */ true);
215 JobController* job_controller_raw_ptr = job_controller.get(); 215 JobController* job_controller_raw_ptr = job_controller.get();
216 job_controller_set_.insert(std::move(job_controller)); 216 job_controller_set_.insert(std::move(job_controller));
217 job_controller_raw_ptr->Preconnect(num_streams, request_info, 217 job_controller_raw_ptr->Preconnect(num_streams, request_info,
218 server_ssl_config, proxy_ssl_config); 218 server_ssl_config, proxy_ssl_config);
219 } 219 }
220 220
221 const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const { 221 const HostMappingRules* HttpStreamFactoryImpl::GetHostMappingRules() const {
222 return session_->params().host_mapping_rules; 222 return &session_->params().host_mapping_rules;
223 } 223 }
224 224
225 void HttpStreamFactoryImpl::OnNewSpdySessionReady( 225 void HttpStreamFactoryImpl::OnNewSpdySessionReady(
226 const base::WeakPtr<SpdySession>& spdy_session, 226 const base::WeakPtr<SpdySession>& spdy_session,
227 bool direct, 227 bool direct,
228 const SSLConfig& used_ssl_config, 228 const SSLConfig& used_ssl_config,
229 const ProxyInfo& used_proxy_info, 229 const ProxyInfo& used_proxy_info,
230 bool was_alpn_negotiated, 230 bool was_alpn_negotiated,
231 NextProto negotiated_protocol, 231 NextProto negotiated_protocol,
232 bool using_spdy, 232 bool using_spdy,
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 factory_dump->AddScalar("main_job_count", 452 factory_dump->AddScalar("main_job_count",
453 base::trace_event::MemoryAllocatorDump::kUnitsObjects, 453 base::trace_event::MemoryAllocatorDump::kUnitsObjects,
454 main_job_count); 454 main_job_count);
455 // The number of preconnect controllers. 455 // The number of preconnect controllers.
456 factory_dump->AddScalar("preconnect_count", 456 factory_dump->AddScalar("preconnect_count",
457 base::trace_event::MemoryAllocatorDump::kUnitsObjects, 457 base::trace_event::MemoryAllocatorDump::kUnitsObjects,
458 num_controllers_for_preconnect); 458 num_controllers_for_preconnect);
459 } 459 }
460 460
461 } // namespace net 461 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_network_session.cc ('k') | net/http/http_stream_factory_impl_job_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698