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

Unified Diff: components/cast_channel/cast_socket_unittest.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
« no previous file with comments | « components/cast_channel/cast_socket.cc ('k') | components/cast_channel/cast_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cast_channel/cast_socket_unittest.cc
diff --git a/components/cast_channel/cast_socket_unittest.cc b/components/cast_channel/cast_socket_unittest.cc
index c620a1f14fad66f570bb94228b637516ad68be60..bf9f4eca05b644ad0e9e5b9c7f589f1260254ffa 100644
--- a/components/cast_channel/cast_socket_unittest.cc
+++ b/components/cast_channel/cast_socket_unittest.cc
@@ -41,9 +41,6 @@
const int64_t kDistantTimeoutMillis = 100000; // 100 seconds (never hit).
-using ::cast_channel::ChannelError;
-using ::cast_channel::ChannelAuthType;
-using ::cast_channel::ReadyState;
using ::testing::_;
using ::testing::A;
using ::testing::DoAll;
@@ -174,32 +171,27 @@ class TestCastSocket : public CastSocketImpl {
static std::unique_ptr<TestCastSocket> CreateSecure(
Logger* logger,
uint64_t device_capabilities = cast_channel::CastDeviceCapability::NONE) {
- return std::unique_ptr<TestCastSocket>(new TestCastSocket(
- CreateIPEndPointForTest(), ChannelAuthType::SSL_VERIFIED,
- kDistantTimeoutMillis, logger, device_capabilities));
+ return std::unique_ptr<TestCastSocket>(
+ new TestCastSocket(CreateIPEndPointForTest(), kDistantTimeoutMillis,
+ logger, device_capabilities));
}
TestCastSocket(const net::IPEndPoint& ip_endpoint,
- ChannelAuthType channel_auth,
int64_t timeout_ms,
Logger* logger,
uint64_t device_capabilities)
: TestCastSocket(ip_endpoint,
- channel_auth,
timeout_ms,
logger,
new net::TestNetLog(),
device_capabilities) {}
TestCastSocket(const net::IPEndPoint& ip_endpoint,
- ChannelAuthType channel_auth,
int64_t timeout_ms,
Logger* logger,
net::TestNetLog* capturing_net_log,
uint64_t device_capabilities)
- : CastSocketImpl("some_extension_id",
- ip_endpoint,
- channel_auth,
+ : CastSocketImpl(ip_endpoint,
capturing_net_log,
base::TimeDelta::FromMilliseconds(timeout_ms),
false,
« no previous file with comments | « components/cast_channel/cast_socket.cc ('k') | components/cast_channel/cast_test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698