| Index: net/http/http_pipelined_host_pool.cc
|
| diff --git a/net/http/http_pipelined_host_pool.cc b/net/http/http_pipelined_host_pool.cc
|
| index ee37e74c29d273792f789fb3c4a00945a9e1bc69..1635e1f0a4f78db99324e6636911100dc399b205 100644
|
| --- a/net/http/http_pipelined_host_pool.cc
|
| +++ b/net/http/http_pipelined_host_pool.cc
|
| @@ -67,8 +67,10 @@ HttpPipelinedStream* HttpPipelinedHostPool::CreateStreamOnNewPipeline(
|
| if (!host) {
|
| return NULL;
|
| }
|
| - return host->CreateStreamOnNewPipeline(connection, used_ssl_config,
|
| - used_proxy_info, net_log,
|
| + return host->CreateStreamOnNewPipeline(connection,
|
| + used_ssl_config,
|
| + used_proxy_info,
|
| + net_log,
|
| was_npn_negotiated,
|
| protocol_negotiated);
|
| }
|
| @@ -92,7 +94,8 @@ bool HttpPipelinedHostPool::IsExistingPipelineAvailableForKey(
|
| }
|
|
|
| HttpPipelinedHost* HttpPipelinedHostPool::GetPipelinedHost(
|
| - const HttpPipelinedHost::Key& key, bool create_if_not_found) {
|
| + const HttpPipelinedHost::Key& key,
|
| + bool create_if_not_found) {
|
| HostMap::iterator host_it = host_map_.find(key);
|
| if (host_it != host_map_.end()) {
|
| CHECK(host_it->second);
|
| @@ -107,8 +110,8 @@ HttpPipelinedHost* HttpPipelinedHostPool::GetPipelinedHost(
|
| return NULL;
|
| }
|
|
|
| - HttpPipelinedHost* host = factory_->CreateNewHost(
|
| - this, key, NULL, capability, force_pipelining_);
|
| + HttpPipelinedHost* host =
|
| + factory_->CreateNewHost(this, key, NULL, capability, force_pipelining_);
|
| host_map_[key] = host;
|
| return host;
|
| }
|
| @@ -134,8 +137,8 @@ void HttpPipelinedHostPool::OnHostDeterminedCapability(
|
|
|
| base::Value* HttpPipelinedHostPool::PipelineInfoToValue() const {
|
| base::ListValue* list = new base::ListValue();
|
| - for (HostMap::const_iterator it = host_map_.begin();
|
| - it != host_map_.end(); ++it) {
|
| + for (HostMap::const_iterator it = host_map_.begin(); it != host_map_.end();
|
| + ++it) {
|
| base::Value* value = it->second->PipelineInfoToValue();
|
| list->Append(value);
|
| }
|
|
|