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

Unified Diff: chrome/browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc

Issue 2974523002: [cast_channel] Make CastSocketService a global leaky singleton (Closed)
Patch Set: merge with master Created 3 years, 5 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: chrome/browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc
diff --git a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc
index 7e12a97596500edeca3b1df9530c3a218431c756..963a24e6f6cd66036824d4e5ee61aeb43dd095f3 100644
--- a/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc
+++ b/chrome/browser/media/router/discovery/mdns/cast_media_sink_service_unittest.cc
@@ -68,23 +68,10 @@ void VerifyMediaSinkInternal(const media_router::MediaSinkInternal& cast_sink,
namespace media_router {
-class MockCastSocketService : public cast_channel::CastSocketService {
- public:
- MOCK_METHOD4(OpenSocket,
- int(const net::IPEndPoint& ip_endpoint,
- net::NetLog* net_log,
- const cast_channel::CastSocket::OnOpenCallback& open_cb,
- cast_channel::CastSocket::Observer* observer));
- MOCK_CONST_METHOD1(GetSocket, cast_channel::CastSocket*(int channel_id));
-
- private:
- ~MockCastSocketService() {}
-};
-
class CastMediaSinkServiceTest : public ::testing::Test {
public:
CastMediaSinkServiceTest()
- : mock_cast_socket_service_(new MockCastSocketService()),
+ : mock_cast_socket_service_(new cast_channel::MockCastSocketService()),
media_sink_service_(
new CastMediaSinkService(mock_sink_discovered_cb_.Get(),
mock_cast_socket_service_.get())),
@@ -103,7 +90,8 @@ class CastMediaSinkServiceTest : public ::testing::Test {
base::MockCallback<MediaSinkService::OnSinksDiscoveredCallback>
mock_sink_discovered_cb_;
- scoped_refptr<MockCastSocketService> mock_cast_socket_service_;
+ std::unique_ptr<cast_channel::MockCastSocketService>
+ mock_cast_socket_service_;
scoped_refptr<CastMediaSinkService> media_sink_service_;
MockDnsSdRegistry test_dns_sd_registry_;
base::MockTimer* mock_timer_;

Powered by Google App Engine
This is Rietveld 408576698