| 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 562a076d27a3d3dcd85d310b0dece04d50dde430..f9f887aaf37e5394eff1b59e73199f2f07032253 100644
|
| --- a/net/quic/chromium/quic_http_stream.h
|
| +++ b/net/quic/chromium/quic_http_stream.h
|
| @@ -36,8 +36,7 @@ class QuicHttpStreamPeer;
|
| // non-owning pointer to a QuicChromiumClientStream which it uses to
|
| // send and receive data.
|
| class NET_EXPORT_PRIVATE QuicHttpStream
|
| - : public QuicChromiumClientStream::Delegate,
|
| - public QuicClientPushPromiseIndex::Delegate,
|
| + : public QuicClientPushPromiseIndex::Delegate,
|
| public MultiplexedHttpStream {
|
| public:
|
| explicit QuicHttpStream(
|
| @@ -68,10 +67,6 @@ class NET_EXPORT_PRIVATE QuicHttpStream
|
| void PopulateNetErrorDetails(NetErrorDetails* details) override;
|
| void SetPriority(RequestPriority priority) override;
|
|
|
| - // QuicChromiumClientStream::Delegate implementation
|
| - void OnClose() override;
|
| - void OnError(int error) override;
|
| -
|
| // QuicClientPushPromiseIndex::Delegate implementation
|
| bool CheckVary(const SpdyHeaderBlock& client_request,
|
| const SpdyHeaderBlock& promise_request,
|
| @@ -131,6 +126,10 @@ class NET_EXPORT_PRIVATE QuicHttpStream
|
|
|
| void ResetStream();
|
|
|
| + // Returns ERR_QUIC_HANDSHAKE_FAILED, if |rv| is ERR_QUIC_PROTOCOL_ERROR and
|
| + // the handshake was never confirmed. Otherwise, returns |rv|.
|
| + int MapStreamError(int rv);
|
| +
|
| // If |has_response_status_| is false, sets |response_status| to the result
|
| // of ComputeResponseStatus(). Returns |response_status_|.
|
| int GetResponseStatus();
|
| @@ -216,8 +215,6 @@ class NET_EXPORT_PRIVATE QuicHttpStream
|
| NetLogWithSource stream_net_log_;
|
|
|
| int session_error_; // Error code from the connection shutdown.
|
| - QuicErrorCode quic_connection_error_; // Cached connection error code.
|
| - QuicRstStreamErrorCode quic_stream_error_; // Cached stream error code.
|
|
|
| bool found_promise_;
|
| // |QuicClientPromisedInfo| owns this. It will be set when |Try()|
|
|
|