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

Unified Diff: components/cast_channel/cast_socket.cc

Issue 2942743002: [cast_channel] Clean up CastSocketImpl ctor parameters (Closed)
Patch Set: 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: components/cast_channel/cast_socket.cc
diff --git a/components/cast_channel/cast_socket.cc b/components/cast_channel/cast_socket.cc
index 3675874ec571c660cac2d6d4af0c0b6c629b0cb6..10de398babb01b651505fc5b879e2c7da6a6ddf4 100644
--- a/components/cast_channel/cast_socket.cc
+++ b/components/cast_channel/cast_socket.cc
@@ -89,17 +89,13 @@ using ChannelError = ::cast_channel::ChannelError;
using ChannelAuthType = ::cast_channel::ChannelAuthType;
using ReadyState = ::cast_channel::ReadyState;
-CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
- const net::IPEndPoint& ip_endpoint,
- ChannelAuthType channel_auth,
+CastSocketImpl::CastSocketImpl(const net::IPEndPoint& ip_endpoint,
net::NetLog* net_log,
const base::TimeDelta& timeout,
bool keep_alive,
const scoped_refptr<Logger>& logger,
uint64_t device_capabilities)
- : CastSocketImpl(owner_extension_id,
- ip_endpoint,
- channel_auth,
+ : CastSocketImpl(ip_endpoint,
net_log,
timeout,
keep_alive,
@@ -107,9 +103,7 @@ CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
device_capabilities,
AuthContext::Create()) {}
-CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
- const net::IPEndPoint& ip_endpoint,
- ChannelAuthType channel_auth,
+CastSocketImpl::CastSocketImpl(const net::IPEndPoint& ip_endpoint,
net::NetLog* net_log,
const base::TimeDelta& timeout,
bool keep_alive,
@@ -118,7 +112,7 @@ CastSocketImpl::CastSocketImpl(const std::string& owner_extension_id,
const AuthContext& auth_context)
: channel_id_(0),
ip_endpoint_(ip_endpoint),
- channel_auth_(channel_auth),
+ channel_auth_(ChannelAuthType::SSL_VERIFIED),
imcheng 2017/06/14 22:25:34 Can we remove this field and just hardcode SSL_VER
zhaobin 2017/06/15 02:22:22 Done.
net_log_(net_log),
keep_alive_(keep_alive),
logger_(logger),

Powered by Google App Engine
This is Rietveld 408576698