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

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

Issue 2942743002: [cast_channel] Clean up CastSocketImpl ctor parameters (Closed)
Patch Set: fix compile error Created 3 years, 6 months 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_channel_api.cc
diff --git a/extensions/browser/api/cast_channel/cast_channel_api.cc b/extensions/browser/api/cast_channel/cast_channel_api.cc
index fe976e306e8cf477762fb3896add50a8073219ff..89273a0ce7194ca7c47d7f67618c820fc8e233a6 100644
--- a/extensions/browser/api/cast_channel/cast_channel_api.cc
+++ b/extensions/browser/api/cast_channel/cast_channel_api.cc
@@ -80,7 +80,7 @@ void FillChannelInfo(const CastSocket& socket, ChannelInfo* channel_info) {
channel_info->connect_info.ip_address = ip_endpoint.ToStringWithoutPort();
channel_info->connect_info.port = ip_endpoint.port();
channel_info->connect_info.auth =
- api::cast_channel::ToChannelAuthType(socket.channel_auth());
+ api::cast_channel::CHANNEL_AUTH_TYPE_SSL_VERIFIED;
channel_info->ready_state =
api::cast_channel::ToReadyState(socket.ready_state());
channel_info->error_state =
@@ -279,8 +279,6 @@ bool CastChannelOpenFunction::Prepare() {
return false;
}
- channel_auth_ =
- api::cast_channel::ToChannelAuthTypeInternal(connect_info.auth);
ip_endpoint_.reset(ParseConnectInfo(connect_info));
return true;
}
@@ -295,8 +293,7 @@ void CastChannelOpenFunction::AsyncWorkStart() {
socket = test_socket.release();
} else {
socket = new CastSocketImpl(
- extension_->id(), *ip_endpoint_, channel_auth_,
- ExtensionsBrowserClient::Get()->GetNetLog(),
+ *ip_endpoint_, ExtensionsBrowserClient::Get()->GetNetLog(),
base::TimeDelta::FromMilliseconds(connect_info.timeout.get()
? *connect_info.timeout
: kDefaultConnectTimeoutMillis),
« no previous file with comments | « extensions/browser/api/cast_channel/cast_channel_api.h ('k') | extensions/browser/api/cast_channel/cast_channel_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698