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

Unified Diff: chrome/browser/ui/webui/media_router/query_result_manager_unittest.cc

Issue 1693963003: Pass origin to StartObservingMediaSinks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Marks Review Fixes with URL changes 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
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:
« no previous file with comments | « chrome/browser/ui/webui/media_router/query_result_manager.cc ('k') | chrome/test/media_router/media_router_e2e_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698