Add a force pipelining option to load flags.

net/http/http_stream_factory_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_stream_factory_impl.h"
 
 #include "base/string_number_conversions.h"
 #include "base/stl_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_log.h"
@@ skipping 20 matching lines @@
   replacements.SetSchemeStr(new_scheme);
   replacements.SetPortStr(new_port);
   return original_url.ReplaceComponents(replacements);
 }
 
 }  // namespace
 
 HttpStreamFactoryImpl::HttpStreamFactoryImpl(HttpNetworkSession* session)
     : session_(session),
       http_pipelined_host_pool_(this, NULL,
-                                session_->http_server_properties()) {}
+                                session_->http_server_properties(),
+                                session_->force_http_pipelining()) {}
 
 HttpStreamFactoryImpl::~HttpStreamFactoryImpl() {
   DCHECK(request_map_.empty());
   DCHECK(spdy_session_request_map_.empty());
 
   std::set<const Job*> tmp_job_set;
   tmp_job_set.swap(orphaned_job_set_);
   STLDeleteContainerPointers(tmp_job_set.begin(), tmp_job_set.end());
   DCHECK(orphaned_job_set_.empty());
 
@@ skipping 173 matching lines @@
   delete job;
 }
 
 void HttpStreamFactoryImpl::OnPreconnectsComplete(const Job* job) {
   preconnect_job_set_.erase(job);
   delete job;
   OnPreconnectsCompleteInternal();
 }
 
 void HttpStreamFactoryImpl::OnHttpPipelinedHostHasAdditionalCapacity(
-    const HostPortPair& origin) {
-  HttpPipelinedStream* stream;
-  while (ContainsKey(http_pipelining_request_map_, origin) &&
-         (stream = http_pipelined_host_pool_.CreateStreamOnExistingPipeline(
-             origin))) {
-    Request* request = *http_pipelining_request_map_[origin].begin();
+    HttpPipelinedHost* host) {
+  while (ContainsKey(http_pipelining_request_map_, host->GetKey())) {
+    HttpPipelinedStream* stream =
+        http_pipelined_host_pool_.CreateStreamOnExistingPipeline(
+            host->GetKey());
+    if (!stream) {
+      break;
+    }
+
+    Request* request = *http_pipelining_request_map_[host->GetKey()].begin();
     request->Complete(stream->was_npn_negotiated(),
                       stream->protocol_negotiated(),
                       false,  // not using_spdy
                       stream->net_log());
     request->OnStreamReady(NULL,
                            stream->used_ssl_config(),
                            stream->used_proxy_info(),
                            stream);
   }
 }
 
+void HttpStreamFactoryImpl::AbortPipelinedRequestsWithKey(
+    const Job* job, const HttpPipelinedHost::Key& key, int status,
+    const SSLConfig& used_ssl_config) {
+  RequestSet requests_to_fail = http_pipelining_request_map_[key];
+  requests_to_fail.erase(request_map_[job]);
+  for (RequestSet::const_iterator it = requests_to_fail.begin();
+       it != requests_to_fail.end(); ++it) {
+    Request* request = *it;
+    request->OnStreamFailed(NULL, status, used_ssl_config);
+  }
+}
+
 }  // namespace net