diff options
| author | perkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-14 10:57:25 +0000 |
|---|---|---|
| committer | perkj@chromium.org <perkj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-14 10:57:25 +0000 |
| commit | 8b1b22d8627cbbca1a4c3792d0af15a683a68375 (patch) | |
| tree | 5180e898ff2dd352d8a1fc204b4c17100cc92c2b /content/browser | |
| parent | f5ca1876063ea91ff405610768a6c1236f0fd38b (diff) | |
| download | chromium_src-8b1b22d8627cbbca1a4c3792d0af15a683a68375.zip chromium_src-8b1b22d8627cbbca1a4c3792d0af15a683a68375.tar.gz chromium_src-8b1b22d8627cbbca1a4c3792d0af15a683a68375.tar.bz2 | |
Add content browser tests for PeerConnection DataChannels.
BUG=166635
Review URL: https://chromiumcodereview.appspot.com/11785041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176655 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
| -rw-r--r-- | content/browser/media/OWNERS | 11 | ||||
| -rw-r--r-- | content/browser/media/webrtc_browsertest.cc (renamed from content/browser/webrtc_browsertest.cc) | 36 |
2 files changed, 47 insertions, 0 deletions
diff --git a/content/browser/media/OWNERS b/content/browser/media/OWNERS new file mode 100644 index 0000000..d132d0e --- /dev/null +++ b/content/browser/media/OWNERS @@ -0,0 +1,11 @@ +acolwell@chromium.org +dalecurtis@chromium.org +ddorwin@chromium.org +fischman@chromium.org +scherkus@chromium.org +shadi@chromium.org +tommi@chromium.org +vrk@chromium.org +wjia@chromium.org +xhwang@chromium.org +xians@chromium.org diff --git a/content/browser/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index 2343e0a..ddceb03 100644 --- a/content/browser/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -92,5 +92,41 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, ExpectTitle("OK"); } +// This test will make a PeerConnection-based call and test an unreliable text +// dataChannel. +IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataOnly) { + CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableDataChannels); + + GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); + NavigateToURL(shell(), url); + + EXPECT_TRUE(ExecuteJavascript("callWithDataOnly();")); + ExpectTitle("OK"); +} + +// This test will make a PeerConnection-based call and test an unreliable text +// dataChannel and audio and video tracks. +IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) { + CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableDataChannels); + + GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); + NavigateToURL(shell(), url); + + EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();")); + ExpectTitle("OK"); +} + +// This test will make a PeerConnection-based call and test an unreliable text +// dataChannel and later add an audio and video track. +IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndLaterAddMedia) { + CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnableDataChannels); + + GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); + NavigateToURL(shell(), url); + + EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();")); + ExpectTitle("OK"); +} + } // namespace content |