chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc - Issue 1415103006: Non-Local Join for Media Router and Presentation API

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

Issue 1415103006: Non-Local Join for Media Router and Presentation API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing ChromeOS System Tray Test Created 4 years, 11 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

« no previous file with comments | « chrome/browser/ui/ash/cast_config_delegate_media_router.cc ('k') | chrome/browser/ui/webui/media_router/media_router_localized_strings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

diff --git a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

index 0f236f4440dee4cfed77834497169cc9cbeda005..ba7f0bf69f42b6b448ce4b8a2bb2486b547800c3 100644

--- a/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

+++ b/chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc

@@ -171,13 +171,15 @@ IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,

// display the local route over a non-local route. This also verifies that we

// display the cast view when we're casting.

test_api.OnCastingSessionStartedOrStopped(true /*is_casting*/);

- media_routes_observer()->OnRoutesUpdated(multiple_routes);

+ media_routes_observer()->OnRoutesUpdated(

+ multiple_routes, std::vector<media_router::MediaRoute::Id>());

EXPECT_TRUE(test_api.IsTrayCastViewVisible());

EXPECT_EQ("local_route", test_api.GetDisplayedCastId());

// When a casting session stops, we shouldn't display the cast view.

test_api.OnCastingSessionStartedOrStopped(false /*is_casting*/);

- media_routes_observer()->OnRoutesUpdated(no_routes);

+ media_routes_observer()->OnRoutesUpdated(

+ no_routes, std::vector<media_router::MediaRoute::Id>());

EXPECT_FALSE(test_api.IsTrayCastViewVisible());

ash::TrayCastTestAPI(GetTrayCast()).ReleaseConfigCallbacks();