Ensure pipelined requests are sent in the same order they're queued.

net/http/http_stream_factory_impl_request.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_request.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "net/http/http_stream_factory_impl_job.h"
 #include "net/spdy/spdy_http_stream.h"
@@ skipping 45 matching lines @@
   DCHECK(!ContainsKey(request_set, this));
   request_set.insert(this);
 }
 
 bool HttpStreamFactoryImpl::Request::SetHttpPipeliningKey(
     const HttpPipelinedHost::Key& http_pipelining_key) {
   DCHECK(!http_pipelining_key_.get());
   http_pipelining_key_.reset(new HttpPipelinedHost::Key(http_pipelining_key));
   bool was_new_key = !ContainsKey(factory_->http_pipelining_request_map_,
                                   http_pipelining_key);
-  RequestSet& request_set =
+  RequestVector& request_vector =
       factory_->http_pipelining_request_map_[http_pipelining_key];
-  DCHECK(!ContainsKey(request_set, this));
-  request_set.insert(this);
+  request_vector.push_back(this);
   return was_new_key;
 }
 
 void HttpStreamFactoryImpl::Request::AttachJob(Job* job) {
   DCHECK(job);
   jobs_.insert(job);
   factory_->request_map_[job] = this;
 }
 
 void HttpStreamFactoryImpl::Request::Complete(
@@ skipping 180 matching lines @@
     spdy_session_key_.reset();
   }
 }
 
 void
 HttpStreamFactoryImpl::Request::RemoveRequestFromHttpPipeliningRequestMap() {
   if (http_pipelining_key_.get()) {
     HttpPipeliningRequestMap& http_pipelining_request_map =
         factory_->http_pipelining_request_map_;
     DCHECK(ContainsKey(http_pipelining_request_map, *http_pipelining_key_));
-    RequestSet& request_set =
+    RequestVector& request_vector =
         http_pipelining_request_map[*http_pipelining_key_];
-    DCHECK(ContainsKey(request_set, this));
-    request_set.erase(this);
-    if (request_set.empty())
+    for (RequestVector::iterator it = request_vector.begin();
+         it != request_vector.end(); ++it) {
+      if (*it == this) {
+        request_vector.erase(it);
+        break;
+      }
+    }
+    if (request_vector.empty())
       http_pipelining_request_map.erase(*http_pipelining_key_);
     http_pipelining_key_.reset();
   }
 }
 
 void HttpStreamFactoryImpl::Request::OnSpdySessionReady(
     Job* job,
     scoped_refptr<SpdySession> spdy_session,
     bool direct) {
   DCHECK(job);
@@ skipping 48 matching lines @@
   RemoveRequestFromHttpPipeliningRequestMap();
 
   std::set<Job*> tmp;
   tmp.swap(jobs_);
 
   for (std::set<Job*>::iterator it = tmp.begin(); it != tmp.end(); ++it)
     factory_->OrphanJob(*it, this);
 }
 
 }  // namespace net