OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/string_number_conversions.h" | 7 #include "base/string_number_conversions.h" |
8 #include "base/stl_util.h" | 8 #include "base/stl_util.h" |
9 #include "googleurl/src/gurl.h" | 9 #include "googleurl/src/gurl.h" |
10 #include "net/base/net_log.h" | 10 #include "net/base/net_log.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 const std::string new_port = base::IntToString(port); | 30 const std::string new_port = base::IntToString(port); |
31 replacements.SetSchemeStr(new_scheme); | 31 replacements.SetSchemeStr(new_scheme); |
32 replacements.SetPortStr(new_port); | 32 replacements.SetPortStr(new_port); |
33 return original_url.ReplaceComponents(replacements); | 33 return original_url.ReplaceComponents(replacements); |
34 } | 34 } |
35 | 35 |
36 } // namespace | 36 } // namespace |
37 | 37 |
38 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session) | 38 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session) |
39 : session_(session), | 39 : session_(session), |
40 http_pipelined_host_pool_(this, NULL) {} | 40 http_pipelined_host_pool_(this, NULL, |
| 41 session_->http_server_properties()) {} |
41 | 42 |
42 HttpStreamFactoryImpl::~HttpStreamFactoryImpl() { | 43 HttpStreamFactoryImpl::~HttpStreamFactoryImpl() { |
43 DCHECK(request_map_.empty()); | 44 DCHECK(request_map_.empty()); |
44 DCHECK(spdy_session_request_map_.empty()); | 45 DCHECK(spdy_session_request_map_.empty()); |
45 | 46 |
46 std::set<const Job*> tmp_job_set; | 47 std::set<const Job*> tmp_job_set; |
47 tmp_job_set.swap(orphaned_job_set_); | 48 tmp_job_set.swap(orphaned_job_set_); |
48 STLDeleteContainerPointers(tmp_job_set.begin(), tmp_job_set.end()); | 49 STLDeleteContainerPointers(tmp_job_set.begin(), tmp_job_set.end()); |
49 DCHECK(orphaned_job_set_.empty()); | 50 DCHECK(orphaned_job_set_.empty()); |
50 | 51 |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 false, // not using_spdy | 237 false, // not using_spdy |
237 stream->source()); | 238 stream->source()); |
238 request->OnStreamReady(NULL, | 239 request->OnStreamReady(NULL, |
239 stream->used_ssl_config(), | 240 stream->used_ssl_config(), |
240 stream->used_proxy_info(), | 241 stream->used_proxy_info(), |
241 stream); | 242 stream); |
242 } | 243 } |
243 } | 244 } |
244 | 245 |
245 } // namespace net | 246 } // namespace net |
OLD | NEW |