| Index: extensions/browser/api/cast_channel/cast_socket.cc
|
| diff --git a/extensions/browser/api/cast_channel/cast_socket.cc b/extensions/browser/api/cast_channel/cast_socket.cc
|
| index 3bb675cf3fd9f74b4424d13044a8cf14ba0d7d99..9ffbc7a5aeb55440ef6e3bc077193ea248b6cfe9 100644
|
| --- a/extensions/browser/api/cast_channel/cast_socket.cc
|
| +++ b/extensions/browser/api/cast_channel/cast_socket.cc
|
| @@ -114,6 +114,25 @@ CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
|
| bool keep_alive,
|
| const scoped_refptr<Logger>& logger,
|
| uint64_t device_capabilities)
|
| + : CastSocketImpl(owner_extension_id,
|
| + ip_endpoint,
|
| + channel_auth,
|
| + net_log,
|
| + timeout,
|
| + keep_alive,
|
| + logger,
|
| + device_capabilities,
|
| + GetChallengeContext()) {}
|
| +
|
| +CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
|
| + const net::IPEndPoint& ip_endpoint,
|
| + ChannelAuthType channel_auth,
|
| + net::NetLog* net_log,
|
| + const base::TimeDelta& timeout,
|
| + bool keep_alive,
|
| + const scoped_refptr<Logger>& logger,
|
| + uint64_t device_capabilities,
|
| + std::unique_ptr<AuthContext> auth_context)
|
| : CastSocket(owner_extension_id),
|
| owner_extension_id_(owner_extension_id),
|
| channel_id_(0),
|
| @@ -122,6 +141,7 @@ CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
|
| net_log_(net_log),
|
| keep_alive_(keep_alive),
|
| logger_(logger),
|
| + auth_context_(std::move(auth_context)),
|
| connect_timeout_(timeout),
|
| connect_timeout_timer_(new base::OneShotTimer),
|
| is_canceled_(false),
|
| @@ -234,8 +254,8 @@ bool CastSocketImpl::VerifyChannelPolicy(const AuthResult& result) {
|
|
|
| bool CastSocketImpl::VerifyChallengeReply() {
|
| DCHECK(peer_cert_);
|
| - AuthResult result =
|
| - AuthenticateChallengeReply(*challenge_reply_, *peer_cert_);
|
| + AuthResult result = AuthenticateChallengeReply(*challenge_reply_, *peer_cert_,
|
| + auth_context_.get());
|
| logger_->LogSocketChallengeReplyEvent(channel_id_, result);
|
| if (result.success()) {
|
| VLOG(1) << result.error_message;
|
| @@ -450,7 +470,7 @@ int CastSocketImpl::DoAuthChallengeSend() {
|
| SetConnectState(proto::CONN_STATE_AUTH_CHALLENGE_SEND_COMPLETE);
|
|
|
| CastMessage challenge_message;
|
| - CreateAuthChallengeMessage(&challenge_message);
|
| + CreateAuthChallengeMessage(&challenge_message, auth_context_.get());
|
| VLOG_WITH_CONNECTION(1) << "Sending challenge: "
|
| << CastMessageToString(challenge_message);
|
|
|
| @@ -618,6 +638,7 @@ void CastSocketImpl::SetErrorState(ChannelError error_state) {
|
| logger_->LogSocketErrorState(channel_id_, ErrorStateToProto(error_state_));
|
| delegate_->OnError(error_state_);
|
| }
|
| +
|
| } // namespace cast_channel
|
| } // namespace api
|
| } // namespace extensions
|
|
|