chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc - Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

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/media/chrome_webrtc_getmediadevices_browsertest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 years, 1 month 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/media/chrome_webrtc_disable_encryption_flag_browsertest.cc ('k') | chrome/browser/media/chrome_webrtc_perf_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc

diff --git a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc

index 8753b3708e9ad5194b78f3305856d2e16f37bb40..be8d639ae21af23f812f6d193f4ef556638ded57 100644

--- a/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc

+++ b/chrome/browser/media/chrome_webrtc_getmediadevices_browsertest.cc

@@ -184,7 +184,7 @@ INSTANTIATE_TEST_CASE_P(WebRtcGetMediaDevicesBrowserTests,

// MediaDevices.enumerateDevices. http://crbug.com/388648.

IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,

DISABLED_GetMediaDevicesWithoutAccess) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

+ ASSERT_TRUE(embedded_test_server()->Start());

GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));

ui_test_utils::NavigateToURL(browser(), url);

content::WebContents* tab =

@@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,

// Disabled, fails due to http://crbug.com/382391.

IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,

DISABLED_GetMediaDevicesWithAccess) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

+ ASSERT_TRUE(embedded_test_server()->Start());

GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));

ui_test_utils::NavigateToURL(browser(), url);

content::WebContents* tab =

@@ -227,7 +227,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,

// MediaDevices.enumerateDevices. http://crbug.com/388648.

IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,

DISABLED_GetMediaDevicesEqualsGetSourcesWithoutAccess) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

+ ASSERT_TRUE(embedded_test_server()->Start());

GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));

ui_test_utils::NavigateToURL(browser(), url);

content::WebContents* tab =

@@ -262,7 +262,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,

// Disabled, fails due to http://crbug.com/382391.

IN_PROC_BROWSER_TEST_P(WebRtcGetMediaDevicesBrowserTest,

DISABLED_GetMediaDevicesEqualsGetSourcesWithAccess) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

+ ASSERT_TRUE(embedded_test_server()->Start());

GURL url(embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));

ui_test_utils::NavigateToURL(browser(), url);

content::WebContents* tab =