[cast_channel] Create KeepAliveDelegate in CastSocket instead of in CastChannelOpenFunction

components/cast_channel/cast_socket.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_CAST_CHANNEL_CAST_SOCKET_H_
 #define COMPONENTS_CAST_CHANNEL_CAST_SOCKET_H_
 
 #include <stdint.h>
 
 #include <queue>
@@ skipping 109 matching lines @@
 //
 // NOTE: Not called "CastChannel" to reduce confusion with the generated API
 // code.
 class CastSocketImpl : public CastSocket {
  public:
   // Creates a new CastSocket that connects to |ip_endpoint|.
   // Parameters:
   // |ip_endpoint|: IP address of the remote host.
   // |net_log|: Log of socket events.
   // |connect_timeout|: Connection timeout interval.
+  // |liveness_timeout|: Amount of idle time to wait before disconnecting.
+  // |ping_interval|: Amount of idle time to wait before pinging the receiver.
   // |logger|: Log of cast channel events.
   CastSocketImpl(const net::IPEndPoint& ip_endpoint,
                  net::NetLog* net_log,
-                 const base::TimeDelta& connect_timeout,
-                 bool keep_alive,
+                 base::TimeDelta connect_timeout,
+                 base::TimeDelta liveness_timeout,
+                 base::TimeDelta ping_interval,
                  const scoped_refptr<Logger>& logger,
                  uint64_t device_capabilities);
 
   // For test-only.
   // This constructor allows for setting a custom AuthContext.
   CastSocketImpl(const net::IPEndPoint& ip_endpoint,
                  net::NetLog* net_log,
-                 const base::TimeDelta& connect_timeout,
-                 bool keep_alive,
+                 base::TimeDelta connect_timeout,
+                 base::TimeDelta liveness_timeout,
+                 base::TimeDelta ping_interval,
                  const scoped_refptr<Logger>& logger,
                  uint64_t device_capabilities,
                  const AuthContext& auth_context);
 
   // Ensures that the socket is closed.
   ~CastSocketImpl() override;
 
   // CastSocket interface.
   void Connect(std::unique_ptr<CastTransport::Delegate> delegate,
                base::Callback<void(ChannelError)> callback) override;
@@ skipping 121 matching lines @@
   THREAD_CHECKER(thread_checker_);
 
   // The id of the channel.
   int channel_id_;
   // The IP endpoint that the the channel is connected to.
   net::IPEndPoint ip_endpoint_;
   // The NetLog for this service.
   net::NetLog* net_log_;
   // The NetLog source for this service.
   net::NetLogSource net_log_source_;
-  // True when keep-alive signaling should be handled for this socket.
-  bool keep_alive_;
+
+  // Amount of idle time to wait before disconnecting. If |liveness_timeout_| is
+  // set, wraps |delegate_| with a KeepAliveDelegate.
+  base::TimeDelta liveness_timeout_;
+
+  // Amount of idle time to wait before pinging the receiver, used to create
+  // KeepAliveDelegate.
+  base::TimeDelta ping_interval_;
 
   // Shared logging object, used to log CastSocket events for diagnostics.
   scoped_refptr<Logger> logger_;
 
   // CertVerifier is owned by us but should be deleted AFTER SSLClientSocket
   // since in some cases the destructor of SSLClientSocket may call a method
   // to cancel a cert verification request.
   std::unique_ptr<net::CertVerifier> cert_verifier_;
   std::unique_ptr<net::TransportSecurityState> transport_security_state_;
   std::unique_ptr<net::CTVerifier> cert_transparency_verifier_;
@@ skipping 68 matching lines @@
 
   // Raw pointer to the auth handshake delegate. Used to get detailed error
   // information.
   AuthTransportDelegate* auth_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(CastSocketImpl);
 };
 }  // namespace cast_channel
 
 #endif  // COMPONENTS_CAST_CHANNEL_CAST_SOCKET_H_