Implement Drain() on HttpPipelinedStream.

net/http/http_pipelined_stream.cc

 // Copyright (c) 2011 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_pipelined_stream.h"
 
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_pipelined_connection_impl.h"
 #include "net/http/http_request_headers.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_info.h"

[mmenke, 2011/11/28 18:39:10]

nit:  Is this needed?  We don't seem to do more than pass HttpResponseInfo
pointers around, so a forward declaration should be enough.

[James Simonsen, 2011/11/29 23:57:28]

Done.

 #include "net/http/http_util.h"
 
 namespace net {
 
 HttpPipelinedStream::HttpPipelinedStream(HttpPipelinedConnectionImpl* pipeline,
                                          int pipeline_id)
     : pipeline_(pipeline),
       pipeline_id_(pipeline_id),
       request_info_(NULL) {
 }
@@ skipping 88 matching lines @@
 }
 
 bool HttpPipelinedStream::IsSpdyHttpStream() const {
   return false;
 }
 
 void HttpPipelinedStream::LogNumRttVsBytesMetrics() const {
   // TODO(simonjam): I don't want to copy & paste this from http_basic_stream.
 }
 
-void HttpPipelinedStream::Drain(HttpNetworkSession*) {
-  // On errors, we already evict everything from the pipeline and close it.
-  // TODO(simonjam): Consider trying to drain the pipeline in the same way that
-  // HttpBasicStream does.
-  delete this;
+void HttpPipelinedStream::Drain(HttpNetworkSession* session) {
+  pipeline_->Drain(this, session);
 }
 
 const SSLConfig& HttpPipelinedStream::used_ssl_config() const {
   return pipeline_->used_ssl_config();
 }
 
 const ProxyInfo& HttpPipelinedStream::used_proxy_info() const {
   return pipeline_->used_proxy_info();
 }
 
 const NetLog::Source& HttpPipelinedStream::source() const {
   return pipeline_->source();
 }
 
 bool HttpPipelinedStream::was_npn_negotiated() const {
   return pipeline_->was_npn_negotiated();
 }
 
 }  // namespace net