diff options
| author | phoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 17:41:00 +0000 |
|---|---|---|
| committer | phoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 17:41:00 +0000 |
| commit | 80552a8894bf45a427671e950e29452f77b904f0 (patch) | |
| tree | 7e73dad9f370bfe7670a85ce0c1f140757e2ba99 /chrome/browser/media | |
| parent | bac66e3eb4378313a71030dfa59c29f6ce5f4e21 (diff) | |
| download | chromium_src-80552a8894bf45a427671e950e29452f77b904f0.zip chromium_src-80552a8894bf45a427671e950e29452f77b904f0.tar.gz chromium_src-80552a8894bf45a427671e950e29452f77b904f0.tar.bz2 | |
Cleaned up WebRTC browser test js, removed unneeded stuff.
This patch merges message_handling.js and jsep01_call.js. The
distinction isn't useful anymore since we used to support multiple
signaling bases like ROAP, we don't anymore. Besides, message_handling
had evolved to practically be the public interface to the test C++,
so this patch makes this role more explicit.
Also the code used to be very flexible to support all kinds of
permutations that we need to do in the manual test page, but since that
code has moved off on its own we can eliminate the flexibility and
thereby greatly simplify the code.
Also improves the error reporting by including the js stack trace
when there's a test failure.
BUG=375240
Review URL: https://codereview.chromium.org/293123009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/media')
| -rw-r--r-- | chrome/browser/media/chrome_webrtc_browsertest.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/media/webrtc_browsertest_base.cc | 26 |
2 files changed, 14 insertions, 13 deletions
diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index a2e5ef1..5f27f85 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -50,6 +50,7 @@ IN_PROC_BROWSER_TEST_P(WebRtcBrowserTest, MANUAL_RunsAudioVideoWebRTCCallInTwoTabs) { if (OnWinXp()) return; + ASSERT_TRUE(test::HasReferenceFilesInCheckout()); ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); content::WebContents* left_tab = diff --git a/chrome/browser/media/webrtc_browsertest_base.cc b/chrome/browser/media/webrtc_browsertest_base.cc index f427b2a..90671d8 100644 --- a/chrome/browser/media/webrtc_browsertest_base.cc +++ b/chrome/browser/media/webrtc_browsertest_base.cc @@ -26,24 +26,24 @@ #endif const char WebRtcTestBase::kAudioVideoCallConstraints[] = - "'{audio: true, video: true}'"; + "{audio: true, video: true}"; const char WebRtcTestBase::kAudioVideoCallConstraintsQVGA[] = - "'{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, " - " minHeight: 240, maxHeight: 240}}}'"; + "{audio: true, video: {mandatory: {minWidth: 320, maxWidth: 320, " + " minHeight: 240, maxHeight: 240}}}"; const char WebRtcTestBase::kAudioVideoCallConstraints360p[] = - "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " - " minHeight: 360, maxHeight: 360}}}'"; + "{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " + " minHeight: 360, maxHeight: 360}}}"; const char WebRtcTestBase::kAudioVideoCallConstraintsVGA[] = - "'{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " - " minHeight: 480, maxHeight: 480}}}'"; + "{audio: true, video: {mandatory: {minWidth: 640, maxWidth: 640, " + " minHeight: 480, maxHeight: 480}}}"; const char WebRtcTestBase::kAudioVideoCallConstraints720p[] = - "'{audio: true, video: {mandatory: {minWidth: 1280, maxWidth: 1280, " - " minHeight: 720, maxHeight: 720}}}'"; + "{audio: true, video: {mandatory: {minWidth: 1280, maxWidth: 1280, " + " minHeight: 720, maxHeight: 720}}}"; const char WebRtcTestBase::kAudioVideoCallConstraints1080p[] = - "'{audio: true, video: {mandatory: {minWidth: 1920, maxWidth: 1920, " - " minHeight: 1080, maxHeight: 1080}}}'"; -const char WebRtcTestBase::kAudioOnlyCallConstraints[] = "'{audio: true}'"; -const char WebRtcTestBase::kVideoOnlyCallConstraints[] = "'{video: true}'"; + "{audio: true, video: {mandatory: {minWidth: 1920, maxWidth: 1920, " + " minHeight: 1080, maxHeight: 1080}}}"; +const char WebRtcTestBase::kAudioOnlyCallConstraints[] = "{audio: true}"; +const char WebRtcTestBase::kVideoOnlyCallConstraints[] = "{video: true}"; const char WebRtcTestBase::kFailedWithPermissionDeniedError[] = "failed-with-error-PermissionDeniedError"; const char WebRtcTestBase::kFailedWithPermissionDismissedError[] = |