Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: content/browser/webrtc/webrtc_media_recorder_browsertest.cc

Issue 2332213005: Media Recorder browser tests: remove MediaRecorder prefix from individual browser tests (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" 9 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 return; 53 return;
54 // This flag is also used for encoding, https://crbug.com/616640. 54 // This flag is also used for encoding, https://crbug.com/616640.
55 base::CommandLine::ForCurrentProcess()->AppendSwitch( 55 base::CommandLine::ForCurrentProcess()->AppendSwitch(
56 switches::kDisableAcceleratedVideoDecode); 56 switches::kDisableAcceleratedVideoDecode);
57 } 57 }
58 58
59 private: 59 private:
60 DISALLOW_COPY_AND_ASSIGN(WebRtcMediaRecorderTest); 60 DISALLOW_COPY_AND_ASSIGN(WebRtcMediaRecorderTest);
61 }; 61 };
62 62
63 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStart) { 63 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Start) {
64 MakeTypicalCall("testStartAndRecorderState();", kMediaRecorderHtmlFile); 64 MakeTypicalCall("testStartAndRecorderState();", kMediaRecorderHtmlFile);
65 } 65 }
66 66
67 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderStartAndStop) { 67 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, StartAndStop) {
68 MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile); 68 MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
69 } 69 }
70 70
71 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, 71 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartAndDataAvailable) {
72 MediaRecorderStartAndDataAvailable) {
73 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); 72 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
74 MakeTypicalCall(base::StringPrintf("testStartAndDataAvailable(\"%s\");", 73 MakeTypicalCall(base::StringPrintf("testStartAndDataAvailable(\"%s\");",
75 GetParam().video_codec.c_str()), 74 GetParam().video_codec.c_str()),
76 kMediaRecorderHtmlFile); 75 kMediaRecorderHtmlFile);
77 } 76 }
78 77
79 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, 78 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, StartWithTimeSlice) {
80 MediaRecorderStartWithTimeSlice) {
81 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); 79 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
82 MakeTypicalCall(base::StringPrintf("testStartWithTimeSlice(\"%s\");", 80 MakeTypicalCall(base::StringPrintf("testStartWithTimeSlice(\"%s\");",
83 GetParam().video_codec.c_str()), 81 GetParam().video_codec.c_str()),
84 kMediaRecorderHtmlFile); 82 kMediaRecorderHtmlFile);
85 } 83 }
86 84
87 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderResume) { 85 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Resume) {
88 MakeTypicalCall("testResumeAndRecorderState();", kMediaRecorderHtmlFile); 86 MakeTypicalCall("testResumeAndRecorderState();", kMediaRecorderHtmlFile);
89 } 87 }
90 88
91 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 89 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, NoResumeWhenRecorderInactive) {
92 MediaRecorderNoResumeWhenRecorderInactive) {
93 MakeTypicalCall("testIllegalResumeThrowsDOMError();", kMediaRecorderHtmlFile); 90 MakeTypicalCall("testIllegalResumeThrowsDOMError();", kMediaRecorderHtmlFile);
94 } 91 }
95 92
96 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, 93 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, ResumeAndDataAvailable) {
97 MediaRecorderResumeAndDataAvailable) {
98 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); 94 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
99 MakeTypicalCall(base::StringPrintf("testResumeAndDataAvailable(\"%s\");", 95 MakeTypicalCall(base::StringPrintf("testResumeAndDataAvailable(\"%s\");",
100 GetParam().video_codec.c_str()), 96 GetParam().video_codec.c_str()),
101 kMediaRecorderHtmlFile); 97 kMediaRecorderHtmlFile);
102 } 98 }
103 99
104 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPause) { 100 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, Pause) {
105 MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile); 101 MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile);
106 } 102 }
107 103
108 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, MediaRecorderPauseStop) { 104 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, PauseStop) {
109 MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile); 105 MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile);
110 } 106 }
111 107
112 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 108 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
113 MediaRecorderPausePreventsDataavailableFromBeingFired) { 109 PausePreventsDataavailableFromBeingFired) {
114 MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();", 110 MakeTypicalCall("testPausePreventsDataavailableFromBeingFired();",
115 kMediaRecorderHtmlFile); 111 kMediaRecorderHtmlFile);
116 } 112 }
117 113
118 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 114 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalPauseThrowsDOMError) {
119 MediaRecorderIllegalPauseThrowsDOMError) {
120 MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile); 115 MakeTypicalCall("testIllegalPauseThrowsDOMError();", kMediaRecorderHtmlFile);
121 } 116 }
122 117
123 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 118 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, TwoChannelAudioRecording) {
124 MediaRecorderTwoChannelAudioRecording) {
125 MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile); 119 MakeTypicalCall("testTwoChannelAudio();", kMediaRecorderHtmlFile);
126 } 120 }
127 121
128 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 122 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, IllegalStopThrowsDOMError) {
129 MediaRecorderIllegalStopThrowsDOMError) {
130 MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile); 123 MakeTypicalCall("testIllegalStopThrowsDOMError();", kMediaRecorderHtmlFile);
131 } 124 }
132 125
133 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 126 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
134 MediaRecorderIllegalStartWhileRecordingThrowsDOMError) { 127 IllegalStartWhileRecordingThrowsDOMError) {
135 MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();", 128 MakeTypicalCall("testIllegalStartInRecordingStateThrowsDOMError();",
136 kMediaRecorderHtmlFile); 129 kMediaRecorderHtmlFile);
137 } 130 }
138 131
139 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 132 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
140 MediaRecorderIllegalStartWhilePausedThrowsDOMError) { 133 IllegalStartWhilePausedThrowsDOMError) {
141 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();", 134 MakeTypicalCall("testIllegalStartInPausedStateThrowsDOMError();",
142 kMediaRecorderHtmlFile); 135 kMediaRecorderHtmlFile);
143 } 136 }
144 137
145 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 138 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
146 MediaRecorderIllegalRequestDataThrowsDOMError) { 139 IllegalRequestDataThrowsDOMError) {
147 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();", 140 MakeTypicalCall("testIllegalRequestDataThrowsDOMError();",
148 kMediaRecorderHtmlFile); 141 kMediaRecorderHtmlFile);
149 } 142 }
150 143
151 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, MediaRecorderPeerConnection) { 144 IN_PROC_BROWSER_TEST_P(WebRtcMediaRecorderTest, PeerConnection) {
152 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator); 145 MaybeForceDisableEncodeAccelerator(GetParam().disable_accelerator);
153 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");", 146 MakeTypicalCall(base::StringPrintf("testRecordRemotePeerConnection(\"%s\");",
154 GetParam().video_codec.c_str()), 147 GetParam().video_codec.c_str()),
155 kMediaRecorderHtmlFile); 148 kMediaRecorderHtmlFile);
156 } 149 }
157 150
158 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 151 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
159 AddingTrackToMediaStreamFiresErrorEvent) { 152 AddingTrackToMediaStreamFiresErrorEvent) {
160 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();", 153 MakeTypicalCall("testAddingTrackToMediaStreamFiresErrorEvent();",
161 kMediaRecorderHtmlFile); 154 kMediaRecorderHtmlFile);
162 } 155 }
163 156
164 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest, 157 IN_PROC_BROWSER_TEST_F(WebRtcMediaRecorderTest,
165 RemovingTrackFromMediaStreamFiresErrorEvent) { 158 RemovingTrackFromMediaStreamFiresErrorEvent) {
166 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();", 159 MakeTypicalCall("testRemovingTrackFromMediaStreamFiresErrorEvent();",
167 kMediaRecorderHtmlFile); 160 kMediaRecorderHtmlFile);
168 } 161 }
169 162
170 INSTANTIATE_TEST_CASE_P(, 163 INSTANTIATE_TEST_CASE_P(,
171 WebRtcMediaRecorderTest, 164 WebRtcMediaRecorderTest,
172 testing::ValuesIn(kEncodingParameters)); 165 testing::ValuesIn(kEncodingParameters));
173 166
174 } // namespace content 167 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698