chrome/browser/ui/ash/system_tray_tray_cast_browsertest_media_router_chromeos.cc - Issue 2678123003: Revert of Convert MediaRouter mojom apis to intake url::Origin objects instead of strings

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 2678123003: Revert of Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (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

« no previous file with comments | « chrome/browser/ui/ash/cast_config_client_media_router.cc ('k') | chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl_unittest.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 eb20ef7364514a3b20e563e7981c0cda5a9a8e20..bd4f50e54d92d0e333b47985e47d4c93627ef02a 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

@@ -118,25 +118,23 @@

// The tray should be hidden when there are no sinks.

EXPECT_FALSE(test_api.IsTrayVisible());

- media_sinks_observer()->OnSinksUpdated(zero_sinks,

- std::vector<url::Origin>());

+ media_sinks_observer()->OnSinksUpdated(zero_sinks, std::vector<GURL>());

// Flush mojo messages from the chrome object to the ash object.

content::RunAllPendingInMessageLoop();

EXPECT_FALSE(test_api.IsTrayVisible());

EXPECT_FALSE(test_api.IsTraySelectViewVisible());

// The tray should be visible with any more than zero sinks.

- media_sinks_observer()->OnSinksUpdated(one_sink, std::vector<url::Origin>());

+ media_sinks_observer()->OnSinksUpdated(one_sink, std::vector<GURL>());

content::RunAllPendingInMessageLoop();

EXPECT_TRUE(test_api.IsTrayVisible());

- media_sinks_observer()->OnSinksUpdated(two_sinks, std::vector<url::Origin>());

+ media_sinks_observer()->OnSinksUpdated(two_sinks, std::vector<GURL>());

content::RunAllPendingInMessageLoop();

EXPECT_TRUE(test_api.IsTrayVisible());

EXPECT_TRUE(test_api.IsTraySelectViewVisible());

// And if all of the sinks go away, it should be hidden again.

- media_sinks_observer()->OnSinksUpdated(zero_sinks,

- std::vector<url::Origin>());

+ media_sinks_observer()->OnSinksUpdated(zero_sinks, std::vector<GURL>());

content::RunAllPendingInMessageLoop();

EXPECT_FALSE(test_api.IsTrayVisible());

EXPECT_FALSE(test_api.IsTraySelectViewVisible());

@@ -154,7 +152,7 @@

// Setup the sinks.

const std::vector<media_router::MediaSink> sinks = {

MakeSink("remote_sink", "name"), MakeSink("local_sink", "name")};

- media_sinks_observer()->OnSinksUpdated(sinks, std::vector<url::Origin>());

+ media_sinks_observer()->OnSinksUpdated(sinks, std::vector<GURL>());

content::RunAllPendingInMessageLoop();

// Create route combinations. More details below.