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

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

Issue 8833003: Revert 113315 (speculative revert for http://crbug.com/106657) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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 | Annotate | Revision Log
« no previous file with comments | « net/http/http_server_properties_impl.cc ('k') | net/net.gyp » ('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) 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
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()) {}
42 41
43 HttpStreamFactoryImpl::~HttpStreamFactoryImpl() { 42 HttpStreamFactoryImpl::~HttpStreamFactoryImpl() {
44 DCHECK(request_map_.empty()); 43 DCHECK(request_map_.empty());
45 DCHECK(spdy_session_request_map_.empty()); 44 DCHECK(spdy_session_request_map_.empty());
46 45
47 std::set<const Job*> tmp_job_set; 46 std::set<const Job*> tmp_job_set;
48 tmp_job_set.swap(orphaned_job_set_); 47 tmp_job_set.swap(orphaned_job_set_);
49 STLDeleteContainerPointers(tmp_job_set.begin(), tmp_job_set.end()); 48 STLDeleteContainerPointers(tmp_job_set.begin(), tmp_job_set.end());
50 DCHECK(orphaned_job_set_.empty()); 49 DCHECK(orphaned_job_set_.empty());
51 50
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 false, // not using_spdy 236 false, // not using_spdy
238 stream->source()); 237 stream->source());
239 request->OnStreamReady(NULL, 238 request->OnStreamReady(NULL,
240 stream->used_ssl_config(), 239 stream->used_ssl_config(),
241 stream->used_proxy_info(), 240 stream->used_proxy_info(),
242 stream); 241 stream);
243 } 242 }
244 } 243 }
245 244
246 } // namespace net 245 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_server_properties_impl.cc ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698