| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 HttpStreamFactoryImpl::Job::Delegate* delegate, | 52 HttpStreamFactoryImpl::Job::Delegate* delegate, |
| 53 HttpStreamFactoryImpl::JobType job_type, | 53 HttpStreamFactoryImpl::JobType job_type, |
| 54 HttpNetworkSession* session, | 54 HttpNetworkSession* session, |
| 55 const HttpRequestInfo& request_info, | 55 const HttpRequestInfo& request_info, |
| 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 const ProxyServer& alternative_proxy_server, |
| 62 NetLog* net_log) override { | 63 NetLog* net_log) override { |
| 63 return new HttpStreamFactoryImpl::Job( | 64 return new HttpStreamFactoryImpl::Job( |
| 64 delegate, job_type, session, request_info, priority, server_ssl_config, | 65 delegate, job_type, session, request_info, priority, server_ssl_config, |
| 65 proxy_ssl_config, destination, origin_url, alternative_service, | 66 proxy_ssl_config, destination, origin_url, alternative_service, |
| 66 net_log); | 67 alternative_proxy_server, net_log); |
| 67 } | 68 } |
| 68 }; | 69 }; |
| 69 } // anonymous namespace | 70 } // anonymous namespace |
| 70 | 71 |
| 71 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session, | 72 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session, |
| 72 bool for_websockets) | 73 bool for_websockets) |
| 73 : session_(session), | 74 : session_(session), |
| 74 job_factory_(new DefaultJobFactory()), | 75 job_factory_(new DefaultJobFactory()), |
| 75 for_websockets_(for_websockets) {} | 76 for_websockets_(for_websockets) {} |
| 76 | 77 |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 ++it) { | 215 ++it) { |
| 215 if (it->get() == controller) { | 216 if (it->get() == controller) { |
| 216 job_controller_set_.erase(it); | 217 job_controller_set_.erase(it); |
| 217 return; | 218 return; |
| 218 } | 219 } |
| 219 } | 220 } |
| 220 NOTREACHED(); | 221 NOTREACHED(); |
| 221 } | 222 } |
| 222 | 223 |
| 223 } // namespace net | 224 } // namespace net |
| OLD | NEW |