OLD | NEW |
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 "content/public/common/content_switches.h" | 6 #include "content/public/common/content_switches.h" |
7 #include "content/public/test/browser_test_utils.h" | 7 #include "content/public/test/browser_test_utils.h" |
8 #include "content/public/test/content_browser_test_utils.h" | 8 #include "content/public/test/content_browser_test_utils.h" |
9 #include "content/test/webrtc_content_browsertest_base.h" | 9 #include "content/test/webrtc_content_browsertest_base.h" |
10 #include "media/base/media_switches.h" | 10 #include "media/base/media_switches.h" |
11 | 11 |
12 #if defined(OS_ANDROID) | 12 #if defined(OS_ANDROID) |
13 // TODO(cpaulin): when crbug.com/561068 is fixed, enable this test | 13 // TODO(cpaulin): when crbug.com/561068 is fixed, enable this test |
14 // on android platform. | |
15 #define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest | 14 #define MAYBE_WebRtcMediaRecorderTest DISABLED_WebRtcMediaRecorderTest |
16 #else | 15 #else |
17 #define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest | 16 #define MAYBE_WebRtcMediaRecorderTest WebRtcMediaRecorderTest |
18 #endif | 17 #endif |
19 | 18 |
20 namespace { | 19 namespace { |
21 | 20 |
22 // Blink features necessary to run the test. | 21 // Blink features necessary to run the test. |
23 static const char kBlinkFeaturesNeeded[] = "GetUserMedia,MediaRecorder"; | 22 static const char kBlinkFeaturesNeeded[] = "GetUserMedia,MediaRecorder"; |
24 | 23 |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 MediaRecorderNoResumeWhenRecorderInactive) { | 92 MediaRecorderNoResumeWhenRecorderInactive) { |
94 MakeTypicalCall("testNoResumeWhileRecorderInactive();", | 93 MakeTypicalCall("testNoResumeWhileRecorderInactive();", |
95 kMediaRecorderHtmlFile); | 94 kMediaRecorderHtmlFile); |
96 } | 95 } |
97 | 96 |
98 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, | 97 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
99 MediaRecorderResumeAndDataAvailable) { | 98 MediaRecorderResumeAndDataAvailable) { |
100 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); | 99 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); |
101 } | 100 } |
102 | 101 |
| 102 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 103 MediaRecorderPause) { |
| 104 MakeTypicalCall("testPauseAndRecorderState();", kMediaRecorderHtmlFile); |
| 105 } |
| 106 |
| 107 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 108 MediaRecorderPauseStop) { |
| 109 MakeTypicalCall("testPauseStopAndRecorderState();", kMediaRecorderHtmlFile); |
| 110 } |
| 111 |
| 112 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 113 MediaRecorderPauseEvent) { |
| 114 MakeTypicalCall("testPauseAndPauseEventTriggered();", kMediaRecorderHtmlFile); |
| 115 } |
| 116 |
| 117 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 118 MediaRecorderPauseAndNoDataAvailable) { |
| 119 MakeTypicalCall("testPauseAndNoDataAvailable();", kMediaRecorderHtmlFile); |
| 120 } |
| 121 |
| 122 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, |
| 123 MediaRecorderNoPauseWhenRecorderInactive) { |
| 124 MakeTypicalCall("testNoPauseWhileRecorderInactive();", |
| 125 kMediaRecorderHtmlFile); |
| 126 } |
| 127 |
103 } // namespace content | 128 } // namespace content |
OLD | NEW |