chrome/test/media_router/media_router_integration_ui_browsertest.cc - Issue 2634213002: [Media Router] Add integration browser tests

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/test/media_router/media_router_integration_ui_browsertest.cc

Issue 2634213002: [Media Router] Add integration browser tests (Closed)

Patch Set: 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

Download patch

« chrome/test/media_router/media_router_integration_browsertest.cc ('K') | « chrome/test/media_router/media_router_integration_browsertest.cc ('k') | chrome/test/media_router/resources/common.js » ('j') | chrome/test/media_router/resources/common.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/media_router/media_router_integration_ui_browsertest.cc

diff --git a/chrome/test/media_router/media_router_integration_ui_browsertest.cc b/chrome/test/media_router/media_router_integration_ui_browsertest.cc

index 3cd9737ab7a774a57de7f76f90f73cf3f181da07..df5825c3561e5e827b1f2fc8525f01eb0870b4bd 100644

--- a/chrome/test/media_router/media_router_integration_ui_browsertest.cc

+++ b/chrome/test/media_router/media_router_integration_ui_browsertest.cc

@@ -19,11 +19,11 @@ const char kTestSinkName[] = "test-sink-1";

}

IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {

- OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));

+ OpenTestPage(FILE_PATH_LITERAL("basic_test.html"), browser());

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

content::WebContents* dialog_contents = OpenMRDialog(web_contents);

- WaitUntilSinkDiscoveredOnUI();

+ WaitUntilSinkDiscoveredOnUI(web_contents);

// Verify the sink list.

std::string sink_length_script = base::StringPrintf(

"domAutomationController.send("

@@ -138,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest, MANUAL_Dialog_Basic) {

IN_PROC_BROWSER_TEST_F(MediaRouterIntegrationBrowserTest,

MANUAL_Dialog_RouteCreationTimedOut) {

SetTestData(FILE_PATH_LITERAL("route_creation_timed_out.json"));

- OpenTestPage(FILE_PATH_LITERAL("basic_test.html"));

+ OpenTestPage(FILE_PATH_LITERAL("basic_test.html"), browser());

content::WebContents* web_contents =

browser()->tab_strip_model()->GetActiveWebContents();

content::WebContents* dialog_contents = OpenMRDialog(web_contents);