| Index: components/cast_channel/cast_socket.h
|
| diff --git a/components/cast_channel/cast_socket.h b/components/cast_channel/cast_socket.h
|
| index af2a44d74c42c1c3b89d5ec22d60a4ad19355d0d..70267101cb102804d25fedfec715ae0c957b0b96 100644
|
| --- a/components/cast_channel/cast_socket.h
|
| +++ b/components/cast_channel/cast_socket.h
|
| @@ -55,10 +55,6 @@ enum CastDeviceCapability {
|
| // Public interface of the CastSocket class.
|
| class CastSocket {
|
| public:
|
| - using ChannelError = ::cast_channel::ChannelError;
|
| - using ChannelAuthType = ::cast_channel::ChannelAuthType;
|
| - using ReadyState = ::cast_channel::ReadyState;
|
| -
|
| virtual ~CastSocket() {}
|
|
|
| // Used by BrowserContextKeyedAPIFactory.
|
| @@ -92,9 +88,6 @@ class CastSocket {
|
| // Sets the channel id generated by CastChannelService.
|
| virtual void set_id(int id) = 0;
|
|
|
| - // The authentication level requested for the channel.
|
| - virtual ChannelAuthType channel_auth() const = 0;
|
| -
|
| // The ready state of the channel.
|
| virtual ReadyState ready_state() const = 0;
|
|
|
| @@ -129,20 +122,13 @@ class CastSocket {
|
| // code.
|
| class CastSocketImpl : public CastSocket {
|
| public:
|
| - // Creates a new CastSocket that connects to |ip_endpoint| with
|
| - // |channel_auth|. |owner_extension_id| is the id of the extension that opened
|
| - // the socket. |channel_auth| must not be CHANNEL_AUTH_NONE.
|
| + // Creates a new CastSocket that connects to |ip_endpoint|.
|
| // Parameters:
|
| - // |owner_extension_id|: ID of the extension calling the API.
|
| // |ip_endpoint|: IP address of the remote host.
|
| - // |channel_auth|: Authentication method used for connecting to a Cast
|
| - // receiver.
|
| // |net_log|: Log of socket events.
|
| // |connect_timeout|: Connection timeout interval.
|
| // |logger|: Log of cast channel events.
|
| - CastSocketImpl(const std::string& owner_extension_id,
|
| - const net::IPEndPoint& ip_endpoint,
|
| - ChannelAuthType channel_auth,
|
| + CastSocketImpl(const net::IPEndPoint& ip_endpoint,
|
| net::NetLog* net_log,
|
| const base::TimeDelta& connect_timeout,
|
| bool keep_alive,
|
| @@ -151,9 +137,7 @@ class CastSocketImpl : public CastSocket {
|
|
|
| // For test-only.
|
| // This constructor allows for setting a custom AuthContext.
|
| - CastSocketImpl(const std::string& owner_extension_id,
|
| - const net::IPEndPoint& ip_endpoint,
|
| - ChannelAuthType channel_auth,
|
| + CastSocketImpl(const net::IPEndPoint& ip_endpoint,
|
| net::NetLog* net_log,
|
| const base::TimeDelta& connect_timeout,
|
| bool keep_alive,
|
| @@ -172,7 +156,6 @@ class CastSocketImpl : public CastSocket {
|
| const net::IPEndPoint& ip_endpoint() const override;
|
| int id() const override;
|
| void set_id(int channel_id) override;
|
| - ChannelAuthType channel_auth() const override;
|
| ReadyState ready_state() const override;
|
| ChannelError error_state() const override;
|
| bool keep_alive() const override;
|
| @@ -295,8 +278,6 @@ class CastSocketImpl : public CastSocket {
|
| int channel_id_;
|
| // The IP endpoint that the the channel is connected to.
|
| net::IPEndPoint ip_endpoint_;
|
| - // Receiver authentication requested for the channel.
|
| - ChannelAuthType channel_auth_;
|
| // The NetLog for this service.
|
| net::NetLog* net_log_;
|
| // The NetLog source for this service.
|
|
|