Chromium Code Reviews| Index: components/cast_channel/cast_socket.h |
| diff --git a/components/cast_channel/cast_socket.h b/components/cast_channel/cast_socket.h |
| index 42b354651561328fecd9bf68c53b84cf2346cdca..c57c223196484ebe785517d565e524803a2eff86 100644 |
| --- a/components/cast_channel/cast_socket.h |
| +++ b/components/cast_channel/cast_socket.h |
| @@ -56,10 +56,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. |
| @@ -131,18 +127,15 @@ class CastSocket { |
| 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. |
| + // |channel_auth|. |channel_auth| must not be CHANNEL_AUTH_NONE. |
|
mark a. foltz
2017/06/12 21:14:08
CHANNEL_AUTH_NONE has been removed from the IDL, s
zhaobin
2017/06/20 01:37:41
Created crbug.com/732669
|
| // 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, |
| + CastSocketImpl(const net::IPEndPoint& ip_endpoint, |
| ChannelAuthType channel_auth, |
| net::NetLog* net_log, |
| const base::TimeDelta& connect_timeout, |
| @@ -152,8 +145,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, |
| + CastSocketImpl(const net::IPEndPoint& ip_endpoint, |
| ChannelAuthType channel_auth, |
| net::NetLog* net_log, |
| const base::TimeDelta& connect_timeout, |