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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/media/router/media_router_mojo_impl_unittest.cc

Issue 1693963003: Pass origin to StartObservingMediaSinks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cache off media source Created 4 years, 10 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
« chrome/browser/media/router/media_router.mojom ('K') | « chrome/browser/media/router/media_router_mojo_impl.cc ('k') | chrome/browser/media/router/media_sinks_observer.h » ('j') | chrome/browser/media/router/media_source.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/router/media_router_mojo_impl_unittest.cc
diff --git a/chrome/browser/media/router/media_router_mojo_impl_unittest.cc b/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
index c9cfaac491883f4249ee857d319c0de2989ad2f1..b30c9769338e10d56425e04e9e7dab7c200643b0 100644
--- a/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
+++ b/chrome/browser/media/router/media_router_mojo_impl_unittest.cc
@@ -482,13 +482,18 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
router()->OnSinkAvailabilityUpdated(
interfaces::MediaRouter::SinkAvailability::AVAILABLE);
MediaSource media_source(kSource);
+ media_source.SetOrigin(kOrigin);
+ GURL origin(kOrigin);
+ MediaSource media_source2(kSource2);
mark a. foltz 2016/03/03 22:58:36 Set an origin on media_source2?
matt.boetger 2016/03/04 00:22:10 Wanted to test not setting an origin for this one.
// These should only be called once even if there is more than one observer
// for a given source.
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource)));
+ StartObservingMediaSinks(mojo::String(kSource),
+ mojo::String(kOrigin)));
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource2)));
+ StartObservingMediaSinks(mojo::String(kSource2),
+ mojo::String("")));
scoped_ptr<MockMediaSinksObserver> sinks_observer(
new MockMediaSinksObserver(router(), media_source));
@@ -497,7 +502,7 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
new MockMediaSinksObserver(router(), media_source));
EXPECT_TRUE(extra_sinks_observer->Init());
scoped_ptr<MockMediaSinksObserver> unrelated_sinks_observer(
- new MockMediaSinksObserver(router(), MediaSource(kSource2)));
+ new MockMediaSinksObserver(router(), media_source2));
EXPECT_TRUE(unrelated_sinks_observer->Init());
ProcessEventLoop();
@@ -520,11 +525,13 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
media_router::interfaces::MediaSink::IconType::CAST;
base::RunLoop run_loop;
- EXPECT_CALL(*sinks_observer, OnSinksReceived(SequenceEquals(expected_sinks)));
+ EXPECT_CALL(*sinks_observer, OnSinksReceived(media_source,
+ SequenceEquals(expected_sinks)));
EXPECT_CALL(*extra_sinks_observer,
- OnSinksReceived(SequenceEquals(expected_sinks)))
+ OnSinksReceived(media_source, SequenceEquals(expected_sinks)))
.WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
media_router_proxy_->OnSinksReceived(media_source.id(),
+ media_source.GetOrigin(),
std::move(mojo_sinks));
run_loop.Run();
@@ -534,44 +541,56 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
scoped_ptr<MockMediaSinksObserver> cached_sinks_observer(
new MockMediaSinksObserver(router(), media_source));
EXPECT_CALL(*cached_sinks_observer,
- OnSinksReceived(SequenceEquals(expected_sinks)));
+ OnSinksReceived(media_source, SequenceEquals(expected_sinks)));
EXPECT_TRUE(cached_sinks_observer->Init());
base::RunLoop run_loop2;
+ base::RunLoop run_loop3;
mark a. foltz 2016/03/03 22:58:36 I want to clean up these test cases not to manage
matt.boetger 2016/03/04 00:22:10 Perhaps that clean up could be in a different CL s
EXPECT_CALL(mock_media_route_provider_,
- StopObservingMediaSinks(mojo::String(kSource)));
- EXPECT_CALL(mock_media_route_provider_,
- StopObservingMediaSinks(mojo::String(kSource2)))
+ StopObservingMediaSinks(mojo::String(kSource),
+ mojo::String(kOrigin)))
.WillOnce(InvokeWithoutArgs([&run_loop2]() {
run_loop2.Quit();
}));
+ EXPECT_CALL(mock_media_route_provider_,
+ StopObservingMediaSinks(mojo::String(kSource2),
+ mojo::String("")))
+ .WillOnce(InvokeWithoutArgs([&run_loop3]() {
+ run_loop3.Quit();
+ }));
sinks_observer.reset();
extra_sinks_observer.reset();
unrelated_sinks_observer.reset();
cached_sinks_observer.reset();
run_loop2.Run();
+ run_loop3.Run();
}
TEST_F(MediaRouterMojoImplTest,
RegisterMediaSinksObserverWithAvailabilityChange) {
+ GURL origin(kOrigin);
// When availability is UNAVAILABLE, no calls should be made to MRPM.
router()->OnSinkAvailabilityUpdated(
interfaces::MediaRouter::SinkAvailability::UNAVAILABLE);
MediaSource media_source(kSource);
+ media_source.SetOrigin(kOrigin);
scoped_ptr<MockMediaSinksObserver> sinks_observer(
new MockMediaSinksObserver(router(), media_source));
- EXPECT_CALL(*sinks_observer, OnSinksReceived(IsEmpty()));
+ EXPECT_CALL(*sinks_observer, OnSinksReceived(media_source, IsEmpty()));
EXPECT_TRUE(sinks_observer->Init());
MediaSource media_source2(kSource2);
+ media_source2.SetOrigin(kOrigin);
scoped_ptr<MockMediaSinksObserver> sinks_observer2(
new MockMediaSinksObserver(router(), media_source2));
- EXPECT_CALL(*sinks_observer2, OnSinksReceived(IsEmpty()));
+ EXPECT_CALL(*sinks_observer2, OnSinksReceived(media_source2, IsEmpty()));
EXPECT_TRUE(sinks_observer2->Init());
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource)))
+ StartObservingMediaSinks(mojo::String(kSource),
+ mojo::String(kOrigin)))
.Times(0);
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource2)))
+ StartObservingMediaSinks(mojo::String(kSource2),
+ mojo::String(kOrigin)))
.Times(0);
ProcessEventLoop();
EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_media_route_provider_));
@@ -581,10 +600,12 @@ TEST_F(MediaRouterMojoImplTest,
router()->OnSinkAvailabilityUpdated(
interfaces::MediaRouter::SinkAvailability::AVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource)))
+ StartObservingMediaSinks(mojo::String(kSource),
+ mojo::String(kOrigin)))
.Times(1);
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource2)))
+ StartObservingMediaSinks(mojo::String(kSource2),
+ mojo::String(kOrigin)))
.Times(1);
ProcessEventLoop();
EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_media_route_provider_));
@@ -593,10 +614,12 @@ TEST_F(MediaRouterMojoImplTest,
router()->OnSinkAvailabilityUpdated(
interfaces::MediaRouter::SinkAvailability::AVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource)))
+ StartObservingMediaSinks(mojo::String(kSource),
+ mojo::String(kOrigin)))
.Times(0);
EXPECT_CALL(mock_media_route_provider_,
- StartObservingMediaSinks(mojo::String(kSource2)))
+ StartObservingMediaSinks(mojo::String(kSource2),
+ mojo::String(kOrigin)))
.Times(0);
ProcessEventLoop();
EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_media_route_provider_));
@@ -606,7 +629,8 @@ TEST_F(MediaRouterMojoImplTest,
router()->OnSinkAvailabilityUpdated(
interfaces::MediaRouter::SinkAvailability::UNAVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
- StopObservingMediaSinks(mojo::String(kSource)))
+ StopObservingMediaSinks(mojo::String(kSource),
+ mojo::String(kOrigin)))
.Times(0);
sinks_observer.reset();
ProcessEventLoop();
@@ -617,7 +641,8 @@ TEST_F(MediaRouterMojoImplTest,
router()->OnSinkAvailabilityUpdated(
interfaces::MediaRouter::SinkAvailability::AVAILABLE);
EXPECT_CALL(mock_media_route_provider_,
- StopObservingMediaSinks(mojo::String(kSource2)));
+ StopObservingMediaSinks(mojo::String(kSource2),
+ mojo::String(kOrigin)));
sinks_observer2.reset();
ProcessEventLoop();
}
« chrome/browser/media/router/media_router.mojom ('K') | « chrome/browser/media/router/media_router_mojo_impl.cc ('k') | chrome/browser/media/router/media_sinks_observer.h » ('j') | chrome/browser/media/router/media_source.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698