| Index: chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
|
| diff --git a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
|
| index 2918454c64cd17339027ccd581eed36465ce440a..7e14d1b58286010b4e646495dd11bf6f974aa0a1 100644
|
| --- a/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
|
| +++ b/chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc
|
| @@ -94,7 +94,9 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
|
| query_result_manager_.GetSourceForCastMode(MediaCastMode::DEFAULT);
|
| EXPECT_TRUE(actual_source.Empty());
|
|
|
| - MediaSource source(MediaSourceForPresentationUrl("http://fooUrl"));
|
| + MediaSource source(
|
| + MediaSourceForPresentationUrl("http://fooUrl.com",
|
| + "http://fooUrl.origin.com"));
|
| EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
|
| .WillOnce(Return(true));
|
| query_result_manager_.StartSinksQuery(MediaCastMode::DEFAULT, source);
|
| @@ -107,7 +109,9 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
|
| EXPECT_TRUE(source.Equals(actual_source));
|
|
|
| // Register a different source for the same cast mode.
|
| - MediaSource another_source(MediaSourceForPresentationUrl("http://barUrl"));
|
| + MediaSource another_source(
|
| + MediaSourceForPresentationUrl("http://barUrl.com",
|
| + "http://barUrl.origin.com"));
|
| EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
|
| EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
|
| .WillOnce(Return(true));
|
| @@ -140,8 +144,10 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
|
|
|
| query_result_manager_.AddObserver(&mock_observer_);
|
| DiscoverSinks(MediaCastMode::DEFAULT,
|
| - MediaSourceForPresentationUrl("http://barUrl"));
|
| - DiscoverSinks(MediaCastMode::TAB_MIRROR, MediaSourceForTab(123));
|
| + MediaSourceForPresentationUrl("http://barUrl.com",
|
| + "http://barUrl.origin.com"));
|
| + DiscoverSinks(MediaCastMode::TAB_MIRROR,
|
| + MediaSourceForTab(123));
|
|
|
| // Scenario (results in this order):
|
| // Action: DEFAULT -> [1, 2, 3]
|
| @@ -166,8 +172,14 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
|
| sinks_query_result.push_back(sink3);
|
| EXPECT_CALL(mock_observer_,
|
| OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
|
| - sinks_observer_it->second->OnSinksReceived(sinks_query_result);
|
| -
|
| + EXPECT_CALL(mock_observer_,
|
| + OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
|
| + sinks_observer_it->second->OnSinksReceived(
|
| + MediaSourceForPresentationUrl("http://barUrl.com",
|
| + "http://barUrl.origin.com"),
|
| + sinks_query_result);
|
| + sinks_observer_it->second->OnSinksReceived(MediaSourceForTab(123),
|
| + sinks_query_result);
|
| // Action: TAB_MIRROR -> [2, 3, 4]
|
| // Expected result:
|
| // Sinks: [1 -> {DEFAULT}, 2 -> {DEFAULT, TAB_MIRROR},
|
| @@ -194,8 +206,10 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
|
| ASSERT_TRUE(sinks_observer_it->second.get());
|
| EXPECT_CALL(mock_observer_,
|
| OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
|
| - sinks_observer_it->second->OnSinksReceived(sinks_query_result);
|
| -
|
| + sinks_observer_it->second->OnSinksReceived(
|
| + MediaSourceForPresentationUrl("http://barUrl.com",
|
| + "http://barUrl.origin.com"),
|
| + sinks_query_result);
|
| // Action: Update default presentation URL
|
| // Expected result:
|
| // Sinks: [2 -> {TAB_MIRROR}, 3 -> {TAB_MIRROR}, 4 -> {TAB_MIRROR}]
|
| @@ -214,7 +228,8 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
|
| OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
|
| query_result_manager_.StartSinksQuery(
|
| MediaCastMode::DEFAULT,
|
| - MediaSourceForPresentationUrl("http://bazurl.com"));
|
| + MediaSourceForPresentationUrl("http://bazurl.com",
|
| + "http://barurl.origin.com"));
|
|
|
| // Action: Remove TAB_MIRROR observer
|
| // Expected result:
|
|
|