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

net/quic/chromium/quic_chromium_client_session.h

 // Copyright (c) 2012 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.
 //
 // A client specific QuicSession subclass.  This class owns the underlying
 // QuicConnection and QuicConnectionHelper objects.  The connection stores
 // a non-owning pointer to the helper so this session needs to ensure that
 // the helper outlives the connection.
 
 #ifndef NET_QUIC_QUIC_CHROMIUM_CLIENT_SESSION_H_
@@ skipping 113 matching lines @@
       const QuicServerId& server_id,
       int yield_after_packets,
       QuicTime::Delta yield_after_duration,
       int cert_verify_flags,
       const QuicConfig& config,
       QuicCryptoClientConfig* crypto_config,
       const char* const connection_description,
       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);
   ~QuicChromiumClientSession() override;
 
   void Initialize() override;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
@@ skipping 156 matching lines @@
   bool HasNonMigratableStreams() const;
 
   bool HandlePromised(QuicStreamId associated_id,
                       QuicStreamId promised_id,
                       const SpdyHeaderBlock& headers) override;
 
   void DeletePromised(QuicClientPromisedInfo* promised) override;
 
   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);
 
   const LoadTimingInfo::ConnectTiming& GetConnectTiming();
 
   QuicVersion GetQuicVersion() const;
 
  protected:
   // QuicSession methods:
@@ skipping 86 matching lines @@
   // the current sockets_.size() == the passed in value.
   bool migration_pending_;  // True while migration is underway.
   base::WeakPtrFactory<QuicChromiumClientSession> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicChromiumClientSession);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_QUIC_CHROMIUM_CLIENT_SESSION_H_