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

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

Issue 2731043002: [Media Router] Add a presentation id to MediaRoute mapping in the MR (Closed)
Patch Set: Created 3 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/media/router/presentation_service_delegate_impl_unittest.cc
diff --git a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
index eb1632f35829fdea83b371eb1f60634de984ded4..8436958d70a560ee5e58aaee0bfb841cbada0480 100644
--- a/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
+++ b/chrome/browser/media/router/presentation_service_delegate_impl_unittest.cc
@@ -145,6 +145,8 @@ class PresentationServiceDelegateImplTest
PresentationRequest request =
delegate_impl_->GetDefaultPresentationRequest();
+ EXPECT_CALL(router_, RegisterPresentationRoute(_, _)).Times(2);
+
// Should not trigger callback since route response is error.
std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromError(
"Error", RouteRequestResult::UNKNOWN_ERROR);
@@ -428,10 +430,13 @@ TEST_F(PresentationServiceDelegateImplTest, ListenForConnnectionStateChange) {
EXPECT_CALL(mock_create_connection_callbacks, OnCreateConnectionSuccess(_))
.Times(1);
- std::unique_ptr<RouteRequestResult> result = RouteRequestResult::FromSuccess(
- MediaRoute("routeId", source1_, "mediaSinkId", "description", true, "",
- true),
- kPresentationId);
+ MediaRoute media_route("routeId", source1_, "mediaSinkId", "description",
+ true, "", true);
+ std::unique_ptr<RouteRequestResult> result =
+ RouteRequestResult::FromSuccess(media_route, kPresentationId);
+ EXPECT_CALL(router_,
+ RegisterPresentationRoute(kPresentationId, Equals(media_route)));
+
for (const auto& route_response_callback : route_response_callbacks)
route_response_callback.Run(*result);
@@ -503,6 +508,9 @@ TEST_F(PresentationServiceDelegateImplTest, ConnectToPresentation) {
"route_id", MediaSourceForPresentationUrl(session_info.presentation_url),
"mediaSinkId", "", true, "", true);
media_route.set_offscreen_presentation(true);
+ EXPECT_CALL(router_,
+ RegisterPresentationRoute(presentation_id, Equals(media_route)));
+
delegate_impl_->OnStartSessionSucceeded(render_process_id, render_frame_id,
mock_callback.Get(), session_info,
media_route);
@@ -529,6 +537,8 @@ TEST_F(PresentationServiceDelegateImplTest, ConnectToPresentation) {
presentation_id,
RenderFrameHostId(render_process_id, render_frame_id)));
EXPECT_CALL(router_, DetachRoute("route_id"));
+ EXPECT_CALL(router_, UnregisterPresentationRoute(presentation_id));
+
delegate_impl_->Reset(render_process_id, render_frame_id);
}

Powered by Google App Engine
This is Rietveld 408576698