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

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

Issue 1132903002: [MediaRouter] Add implementation of PresentationServiceDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addresses Wez's comments Created 5 years, 7 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 c5a6750287253e18e568055cd3f793a4318f3d5b..55f8d6a42e208bae9271524bd7da7bca85622e63 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,7 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
query_result_manager_.GetSourceForCastMode(MediaCastMode::DEFAULT);
EXPECT_TRUE(actual_source.Empty());
- MediaSource source(ForPresentationUrl("http://fooUrl"));
+ MediaSource source(MediaSourceForPresentationUrl("http://fooUrl"));
EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
.WillOnce(Return(true));
query_result_manager_.StartSinksQuery(MediaCastMode::DEFAULT, source);
@@ -107,7 +107,7 @@ TEST_F(QueryResultManagerTest, StartStopSinksQuery) {
EXPECT_TRUE(source.Equals(actual_source));
// Register a different source for the same cast mode.
- MediaSource another_source(ForPresentationUrl("http://barUrl"));
+ MediaSource another_source(MediaSourceForPresentationUrl("http://barUrl"));
EXPECT_CALL(mock_router_, UnregisterMediaSinksObserver(_)).Times(1);
EXPECT_CALL(mock_router_, RegisterMediaSinksObserver(_))
.WillOnce(Return(true));
@@ -139,8 +139,9 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
MediaSink sink5("sinkId5", "Sink 5");
query_result_manager_.AddObserver(&mock_observer_);
- DiscoverSinks(MediaCastMode::DEFAULT, ForPresentationUrl("http://barUrl"));
- DiscoverSinks(MediaCastMode::TAB_MIRROR, ForTabMediaSource(123));
+ DiscoverSinks(MediaCastMode::DEFAULT,
+ MediaSourceForPresentationUrl("http://barUrl"));
+ DiscoverSinks(MediaCastMode::TAB_MIRROR, MediaSourceForTab(123));
// Scenario (results in this order):
// Action: DEFAULT -> [1, 2, 3]
@@ -213,7 +214,7 @@ TEST_F(QueryResultManagerTest, MultipleQueries) {
OnResultsUpdated(VectorEquals(expected_sinks))).Times(1);
query_result_manager_.StartSinksQuery(
MediaCastMode::DEFAULT,
- ForPresentationUrl("http://bazurl.com"));
+ MediaSourceForPresentationUrl("http://bazurl.com"));
// Action: Remove TAB_MIRROR observer
// Expected result:

Powered by Google App Engine
This is Rietveld 408576698