| Index: net/http/http_network_session.cc
|
| diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
|
| index fda084eab56900bcf246229fa108e0e9c72f91f0..ef6bd7acb4adcc8da2bd16eaea072b354c027286 100644
|
| --- a/net/http/http_network_session.cc
|
| +++ b/net/http/http_network_session.cc
|
| @@ -396,7 +396,9 @@ bool HttpNetworkSession::IsProtocolEnabled(NextProto protocol) const {
|
|
|
| void HttpNetworkSession::SetServerPushDelegate(
|
| std::unique_ptr<ServerPushDelegate> push_delegate) {
|
| - DCHECK(!push_delegate_ && push_delegate);
|
| + DCHECK(push_delegate);
|
| + if (!params_.enable_server_push_cancellation || push_delegate_)
|
| + return;
|
|
|
| push_delegate_ = std::move(push_delegate);
|
| spdy_session_pool_.set_server_push_delegate(push_delegate_.get());
|
|
|