| Index: net/quic/chromium/quic_http_stream.h
|
| diff --git a/net/quic/chromium/quic_http_stream.h b/net/quic/chromium/quic_http_stream.h
|
| index f9f887aaf37e5394eff1b59e73199f2f07032253..9add684073764418c27f6aafcfe487e7bd78ddc8 100644
|
| --- a/net/quic/chromium/quic_http_stream.h
|
| +++ b/net/quic/chromium/quic_http_stream.h
|
| @@ -35,9 +35,7 @@ class QuicHttpStreamPeer;
|
| // The QuicHttpStream is a QUIC-specific HttpStream subclass. It holds a
|
| // non-owning pointer to a QuicChromiumClientStream which it uses to
|
| // send and receive data.
|
| -class NET_EXPORT_PRIVATE QuicHttpStream
|
| - : public QuicClientPushPromiseIndex::Delegate,
|
| - public MultiplexedHttpStream {
|
| +class NET_EXPORT_PRIVATE QuicHttpStream : public MultiplexedHttpStream {
|
| public:
|
| explicit QuicHttpStream(
|
| std::unique_ptr<QuicChromiumClientSession::Handle> session);
|
| @@ -67,15 +65,6 @@ class NET_EXPORT_PRIVATE QuicHttpStream
|
| void PopulateNetErrorDetails(NetErrorDetails* details) override;
|
| void SetPriority(RequestPriority priority) override;
|
|
|
| - // QuicClientPushPromiseIndex::Delegate implementation
|
| - bool CheckVary(const SpdyHeaderBlock& client_request,
|
| - const SpdyHeaderBlock& promise_request,
|
| - const SpdyHeaderBlock& promise_response) override;
|
| - // TODO(rch): QuicClientPushPromiseIndex::Delegate is part of shared code.
|
| - // Figure out how to make the QuicHttpStream receive a Handle in this
|
| - // case instead of a QuicSpdyStream.
|
| - void OnRendezvousResult(QuicSpdyStream* stream) override;
|
| -
|
| static HttpResponseInfo::ConnectionInfo ConnectionInfoFromQuicVersion(
|
| QuicVersion quic_version);
|
|
|
| @@ -217,11 +206,6 @@ class NET_EXPORT_PRIVATE QuicHttpStream
|
| int session_error_; // Error code from the connection shutdown.
|
|
|
| bool found_promise_;
|
| - // |QuicClientPromisedInfo| owns this. It will be set when |Try()|
|
| - // is asynchronous, i.e. it returned QUIC_PENDING, and remains valid
|
| - // until |OnRendezvouResult()| fires or |push_handle_->Cancel()| is
|
| - // invoked.
|
| - QuicClientPushPromiseIndex::TryHandle* push_handle_;
|
|
|
| // Set to true when DoLoop() is being executed, false otherwise.
|
| bool in_loop_;
|
|
|