Server push cancellation: change the ownership of ServerPushDelegate to HttpNetworkSession.

net/quic/chromium/quic_chromium_client_session.h

Index: net/quic/chromium/quic_chromium_client_session.h
diff --git a/net/quic/chromium/quic_chromium_client_session.h b/net/quic/chromium/quic_chromium_client_session.h
index 04eeda4a4b304b6e5d944e8f0844a745db106fd4..3c2b94d41a0247bd15a987cdbba21f3d6ba30691 100644
--- a/net/quic/chromium/quic_chromium_client_session.h
+++ b/net/quic/chromium/quic_chromium_client_session.h
@@ -131,6 +131,7 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession
       base::TimeTicks dns_resolution_start_time,
       base::TimeTicks dns_resolution_end_time,
       QuicClientPushPromiseIndex* push_promise_index,
+      ServerPushDelegate* push_delegate,

[Ryan Hamilton, 2016/11/23 20:43:30]

Should this method DCHECK that push_delegate is non-null?

[Zhongyi Shi, 2016/11/23 23:53:49]

Nope. The push_delegate will be null if we don't enable server push
cancellation.

       base::TaskRunner* task_runner,
       std::unique_ptr<SocketPerformanceWatcher> socket_performance_watcher,
       NetLog* net_log);
@@ -307,10 +308,6 @@ class NET_EXPORT_PRIVATE QuicChromiumClientSession
 
   void OnPushStreamTimedOut(QuicStreamId stream_id) override;
 
-  void set_push_delegate(ServerPushDelegate* push_delegate) {
-    push_delegate_ = push_delegate;
-  }
-
   // Cancels the push if the push stream for |url| has not been claimed and is
   // still active. Otherwise, no-op.
   void CancelPush(const GURL& url);