Commit ec021fcf authored by Derek Cheng's avatar Derek Cheng Committed by Commit Bot

[MediaRouter] Fix / clean up a MediaRouterMojoImplTest.

This patch cleans up how RunLoop is used in the test
MediaRouterMojoImplTest.RegisterAndUnregisterMediaSinksObserver, which
will fail with upcoming Mojo changes.

Tested with https://chromium-review.googlesource.com/c/chromium/src/+/1145692
applied.

Bug: 869550
Change-Id: I9a7b0d18d3422101a775490863d825df4fd51ec4
Reviewed-on: https://chromium-review.googlesource.com/1159271Reviewed-by: default avatarKen Rockot <rockot@chromium.org>
Commit-Queue: Derek Cheng <imcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579958}
parent cebdc85e
...@@ -597,18 +597,15 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) { ...@@ -597,18 +597,15 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
for (const auto& expected_sink : expected_sinks) { for (const auto& expected_sink : expected_sinks) {
MediaSinkInternal sink_internal; MediaSinkInternal sink_internal;
sink_internal.set_sink(expected_sink); sink_internal.set_sink(expected_sink);
sinks.push_back(sink_internal); sinks.push_back(std::move(sink_internal));
} }
base::RunLoop run_loop;
EXPECT_CALL(*sinks_observer, OnSinksReceived(SequenceEquals(expected_sinks))); EXPECT_CALL(*sinks_observer, OnSinksReceived(SequenceEquals(expected_sinks)));
EXPECT_CALL(*extra_sinks_observer, EXPECT_CALL(*extra_sinks_observer,
OnSinksReceived(SequenceEquals(expected_sinks))) OnSinksReceived(SequenceEquals(expected_sinks)));
.WillOnce(InvokeWithoutArgs([&run_loop]() { run_loop.Quit(); }));
router()->OnSinksReceived( router()->OnSinksReceived(
MediaRouteProviderId::EXTENSION, media_source.id(), sinks, MediaRouteProviderId::EXTENSION, media_source.id(), sinks,
std::vector<url::Origin>(1, url::Origin::Create(GURL(kOrigin)))); std::vector<url::Origin>(1, url::Origin::Create(GURL(kOrigin))));
run_loop.Run();
// Since the MediaRouterMojoImpl has already received results for // Since the MediaRouterMojoImpl has already received results for
// |media_source|, return cached results to observers that are subsequently // |media_source|, return cached results to observers that are subsequently
...@@ -625,16 +622,14 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) { ...@@ -625,16 +622,14 @@ TEST_F(MediaRouterMojoImplTest, RegisterAndUnregisterMediaSinksObserver) {
EXPECT_CALL(*cached_sinks_observer2, OnSinksReceived(IsEmpty())); EXPECT_CALL(*cached_sinks_observer2, OnSinksReceived(IsEmpty()));
EXPECT_TRUE(cached_sinks_observer2->Init()); EXPECT_TRUE(cached_sinks_observer2->Init());
base::RunLoop run_loop2;
EXPECT_CALL(mock_extension_provider_, StopObservingMediaSinks(kSource)); EXPECT_CALL(mock_extension_provider_, StopObservingMediaSinks(kSource));
EXPECT_CALL(mock_extension_provider_, StopObservingMediaSinks(kSource2)) EXPECT_CALL(mock_extension_provider_, StopObservingMediaSinks(kSource2));
.WillOnce(InvokeWithoutArgs([&run_loop2]() { run_loop2.Quit(); }));
sinks_observer.reset(); sinks_observer.reset();
extra_sinks_observer.reset(); extra_sinks_observer.reset();
unrelated_sinks_observer.reset(); unrelated_sinks_observer.reset();
cached_sinks_observer.reset(); cached_sinks_observer.reset();
cached_sinks_observer2.reset(); cached_sinks_observer2.reset();
run_loop2.Run(); base::RunLoop().RunUntilIdle();
} }
TEST_F(MediaRouterMojoImplTest, TEST_F(MediaRouterMojoImplTest,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment