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

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

Issue 2627463003: Convert MediaRouter mojom apis to intake url::Origin objects instead of strings (Closed)

Patch Set: return an Origin instead of GURL for GetLastCommittedURLForFrame Created 3 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

« chrome/browser/media/router/presentation_service_delegate_impl.cc ('K') | « 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 0184f44c720a58f1076e029516dc6f71cfbea553..0534c0c53c0619e54dfdf93cac7812e75ad89720 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

@@ -119,23 +119,25 @@ IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,

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

EXPECT_FALSE(test_api.IsTrayVisible());

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

+ media_sinks_observer()->OnSinksUpdated(zero_sinks,

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

// 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<GURL>());

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

content::RunAllPendingInMessageLoop();

EXPECT_TRUE(test_api.IsTrayVisible());

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

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

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<GURL>());

+ media_sinks_observer()->OnSinksUpdated(zero_sinks,

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

content::RunAllPendingInMessageLoop();

EXPECT_FALSE(test_api.IsTrayVisible());

EXPECT_FALSE(test_api.IsTraySelectViewVisible());

@@ -154,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(SystemTrayTrayCastMediaRouterChromeOSTest,

std::vector<media_router::MediaSink> sinks;

sinks.push_back(MakeSink("remote_sink", "name"));

sinks.push_back(MakeSink("local_sink", "name"));

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

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

content::RunAllPendingInMessageLoop();

// Create route combinations. More details below.