| 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 "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 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 RequestPriority priority, | 56 RequestPriority priority, |
| 57 const SSLConfig& server_ssl_config, | 57 const SSLConfig& server_ssl_config, |
| 58 const SSLConfig& proxy_ssl_config, | 58 const SSLConfig& proxy_ssl_config, |
| 59 HostPortPair destination, | 59 HostPortPair destination, |
| 60 GURL origin_url, | 60 GURL origin_url, |
| 61 AlternativeService alternative_service, | 61 AlternativeService alternative_service, |
| 62 NetLog* net_log) override { | 62 NetLog* net_log) override { |
| 63 return new HttpStreamFactoryImpl::Job( | 63 return new HttpStreamFactoryImpl::Job( |
| 64 delegate, job_type, session, request_info, priority, server_ssl_config, | 64 delegate, job_type, session, request_info, priority, server_ssl_config, |
| 65 proxy_ssl_config, destination, origin_url, alternative_service, | 65 proxy_ssl_config, destination, origin_url, alternative_service, |
| 66 net_log); | 66 ProxyServer(), net_log); |
| 67 } |
| 68 |
| 69 HttpStreamFactoryImpl::Job* CreateJob( |
| 70 HttpStreamFactoryImpl::Job::Delegate* delegate, |
| 71 HttpStreamFactoryImpl::JobType job_type, |
| 72 HttpNetworkSession* session, |
| 73 const HttpRequestInfo& request_info, |
| 74 RequestPriority priority, |
| 75 const SSLConfig& server_ssl_config, |
| 76 const SSLConfig& proxy_ssl_config, |
| 77 HostPortPair destination, |
| 78 GURL origin_url, |
| 79 const ProxyServer& alternative_proxy_server, |
| 80 NetLog* net_log) override { |
| 81 return new HttpStreamFactoryImpl::Job( |
| 82 delegate, job_type, session, request_info, priority, server_ssl_config, |
| 83 proxy_ssl_config, destination, origin_url, AlternativeService(), |
| 84 alternative_proxy_server, net_log); |
| 67 } | 85 } |
| 68 }; | 86 }; |
| 69 } // anonymous namespace | 87 } // anonymous namespace |
| 70 | 88 |
| 71 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session, | 89 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session, |
| 72 bool for_websockets) | 90 bool for_websockets) |
| 73 : session_(session), | 91 : session_(session), |
| 74 job_factory_(new DefaultJobFactory()), | 92 job_factory_(new DefaultJobFactory()), |
| 75 for_websockets_(for_websockets) {} | 93 for_websockets_(for_websockets) {} |
| 76 | 94 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 ++it) { | 232 ++it) { |
| 215 if (it->get() == controller) { | 233 if (it->get() == controller) { |
| 216 job_controller_set_.erase(it); | 234 job_controller_set_.erase(it); |
| 217 return; | 235 return; |
| 218 } | 236 } |
| 219 } | 237 } |
| 220 NOTREACHED(); | 238 NOTREACHED(); |
| 221 } | 239 } |
| 222 | 240 |
| 223 } // namespace net | 241 } // namespace net |
| OLD | NEW |