Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Unified Diff: extensions/browser/api/cast_channel/cast_socket.cc

Issue 2559283003: remove CHANNEL_AUTH_TYPE_SSL from ChannelAuthType (Closed)
Patch Set: Fixing browser api tests + rebase Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 5cf9f29e0b000c98e5e6efe7d896d4404d3a2e72..3bb675cf3fd9f74b4424d13044a8cf14ba0d7d99 100644
--- a/extensions/browser/api/cast_channel/cast_socket.cc
+++ b/extensions/browser/api/cast_channel/cast_socket.cc
@@ -132,8 +132,6 @@ CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
ready_state_(READY_STATE_NONE),
auth_delegate_(nullptr) {
DCHECK(net_log_);
- DCHECK(channel_auth_ == CHANNEL_AUTH_TYPE_SSL ||
- channel_auth_ == CHANNEL_AUTH_TYPE_SSL_VERIFIED);
net_log_source_.type = net::NetLogSourceType::SOCKET;
net_log_source_.id = net_log_->NextID();
}
@@ -436,13 +434,7 @@ int CastSocketImpl::DoSslConnectComplete(int result) {
}
auth_delegate_ = new AuthTransportDelegate(this);
transport_->SetReadDelegate(base::WrapUnique(auth_delegate_));
- if (channel_auth_ == CHANNEL_AUTH_TYPE_SSL_VERIFIED) {
- // Additionally verify the connection with a handshake.
- SetConnectState(proto::CONN_STATE_AUTH_CHALLENGE_SEND);
- } else {
- SetConnectState(proto::CONN_STATE_FINISHED);
- transport_->Start();
- }
+ SetConnectState(proto::CONN_STATE_AUTH_CHALLENGE_SEND);
} else if (result == net::ERR_CONNECTION_TIMED_OUT) {
SetConnectState(proto::CONN_STATE_FINISHED);
SetErrorState(CHANNEL_ERROR_CONNECT_TIMEOUT);

Powered by Google App Engine
This is Rietveld 408576698