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

Unified Diff: chrome/test/media_router/media_router_e2e_browsertest.cc

Issue 1693963003: Pass origin to StartObservingMediaSinks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Marks Review Fixes with URL changes Created 4 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/test/media_router/media_router_e2e_browsertest.cc
diff --git a/chrome/test/media_router/media_router_e2e_browsertest.cc b/chrome/test/media_router/media_router_e2e_browsertest.cc
index 6b232d61c6dc69afc72c8867cee60cecbddc9f9c..3792ffde865c04c9e157a452f01a876f43febd32 100644
--- a/chrome/test/media_router/media_router_e2e_browsertest.cc
+++ b/chrome/test/media_router/media_router_e2e_browsertest.cc
@@ -79,7 +79,6 @@ void MediaRouterE2EBrowserTest::OnRouteResponseReceived(
void MediaRouterE2EBrowserTest::CreateMediaRoute(
const MediaSource& source,
- const GURL& origin,
content::WebContents* web_contents) {
DCHECK(media_router_);
observer_.reset(new TestMediaSinksObserver(media_router_, source));
@@ -101,9 +100,9 @@ void MediaRouterE2EBrowserTest::CreateMediaRoute(
route_response_callbacks.push_back(
base::Bind(&MediaRouterE2EBrowserTest::OnRouteResponseReceived,
base::Unretained(this)));
- media_router_->CreateRoute(source.id(), sink.id(), origin, web_contents,
- route_response_callbacks, base::TimeDelta(),
- is_off_the_record());
+ media_router_->CreateRoute(source.id(), sink.id(), GURL(source.origin()),
+ web_contents, route_response_callbacks,
+ base::TimeDelta(), is_off_the_record());
// Wait for the route request to be fulfilled (and route to be started).
ASSERT_TRUE(ConditionalWait(
@@ -149,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest, MANUAL_TabMirroring) {
// Wait for 30 seconds to make sure the route is stable.
CreateMediaRoute(
- MediaSourceForTab(tab_id), GURL(kOriginUrl), web_contents);
+ MediaSourceForTab(tab_id), web_contents);
Wait(base::TimeDelta::FromSeconds(30));
// Wait for 10 seconds to make sure route has been stopped.
@@ -159,8 +158,9 @@ IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest, MANUAL_TabMirroring) {
IN_PROC_BROWSER_TEST_F(MediaRouterE2EBrowserTest, MANUAL_CastApp) {
// Wait for 30 seconds to make sure the route is stable.
- CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl),
- GURL(kOriginUrl), nullptr);
+ CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl,
+ kOriginUrl),
+ nullptr);
Wait(base::TimeDelta::FromSeconds(30));
// Wait for 10 seconds to make sure route has been stopped.
« no previous file with comments | « chrome/test/media_router/media_router_e2e_browsertest.h ('k') | chrome/test/media_router/test_media_sinks_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698