| Index: content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| diff --git a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| index 02d98859ac40de06507f82d9df15f647de7573c0..e60cffa8decdb367a497fcf1f4d7d476395b5ded 100644
|
| --- a/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| +++ b/content/browser/webrtc/webrtc_media_recorder_browsertest.cc
|
| @@ -60,95 +60,88 @@ class WebRtcMediaRecorderTest
|
| DISALLOW_COPY_AND_ASSIGN(WebRtcMediaRecorderTest);
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStart) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Start) {
|
| MakeTypicalCall("testStartAndRecorderState();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStartAndStop) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, StartAndStop) {
|
| MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest,
|
| - MediaRecorderStartAndDataAvailable) {
|
| +IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartAndDataAvailable) {
|
| MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
|
| MakeTypicalCall(base::StringPrintf("testStartAndDataAvailable(\"%s\");",
|
| GetParam().video_codec.c_str()),
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest,
|
| - MediaRecorderStartWithTimeSlice) {
|
| +IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartWithTimeSlice) {
|
| MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
|
| MakeTypicalCall(base::StringPrintf("testStartWithTimeSlice(\"%s\");",
|
| GetParam().video_codec.c_str()),
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderResume) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Resume) {
|
| MakeTypicalCall("testResumeAndRecorderState();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderNoResumeWhenRecorderInactive) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, NoResumeWhenRecorderInactive) {
|
| MakeTypicalCall("testIllegalResumeThrowsDOMError();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest,
|
| - MediaRecorderResumeAndDataAvailable) {
|
| +IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, ResumeAndDataAvailable) {
|
| MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
|
| MakeTypicalCall(base::StringPrintf("testResumeAndDataAvailable(\"%s\");",
|
| GetParam().video_codec.c_str()),
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPause) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Pause) {
|
| MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPauseStop) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, PauseStop) {
|
| MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderPausePreventsDataavailableFromBeingFired) {
|
| + PausePreventsDataavailableFromBeingFired) {
|
| MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();",
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderIllegalPauseThrowsDOMError) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalPauseThrowsDOMError) {
|
| MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderTwoChannelAudioRecording) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) {
|
| MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderIllegalStopThrowsDOMError) {
|
| +IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalStopThrowsDOMError) {
|
| MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderIllegalStartWhileRecordingThrowsDOMError) {
|
| + IllegalStartWhileRecordingThrowsDOMError) {
|
| MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderIllegalStartWhilePausedThrowsDOMError) {
|
| + IllegalStartWhilePausedThrowsDOMError) {
|
| MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();",
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
|
| - MediaRecorderIllegalRequestDataThrowsDOMError) {
|
| + IllegalRequestDataThrowsDOMError) {
|
| MakeTypicalCall("testIllegalRequestDataThrowsDOMError();",
|
| kMediaRecorderHtmlFile);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MediaRecorderPeerConnection) {
|
| +IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, PeerConnection) {
|
| MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
|
| MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");",
|
| GetParam().video_codec.c_str()),
|
|
|