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

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

Issue 1502693002: Undo WebRtcMediaRecorderTest.MediaRecorderStartWithTimeSlice exclusion (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | tools/valgrind/gtest_exclude/content_browsertests.gtest-drmemory.txt » ('j') | 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 "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"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, 57 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
58 MediaRecorderStartAndStop) { 58 MediaRecorderStartAndStop) {
59 MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile); 59 MakeTypicalCall("testStartStopAndRecorderState();", kMediaRecorderHtmlFile);
60 } 60 }
61 61
62 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, 62 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
63 MediaRecorderStartAndDataAvailable) { 63 MediaRecorderStartAndDataAvailable) {
64 MakeTypicalCall("testStartAndDataAvailable();", kMediaRecorderHtmlFile); 64 MakeTypicalCall("testStartAndDataAvailable();", kMediaRecorderHtmlFile);
65 } 65 }
66 66
67 // Fails flakily under ThreadSanitizer, http://crbug.com/562406.
68 #if defined(THREAD_SANITIZER)
69 #define MAYBE_MediaRecorderStartWithTimeSlice DISABLED_MediaRecorderStartWithTim eSlice
70 #else
71 #define MAYBE_MediaRecorderStartWithTimeSlice MediaRecorderStartWithTimeSlice
72 #endif
73 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, 67 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
74 MAYBE_MediaRecorderStartWithTimeSlice) { 68 MediaRecorderStartWithTimeSlice) {
75 MakeTypicalCall("testStartWithTimeSlice();", kMediaRecorderHtmlFile); 69 MakeTypicalCall("testStartWithTimeSlice();", kMediaRecorderHtmlFile);
76 } 70 }
77 71
78 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, MediaRecorderStartEvent) { 72 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, MediaRecorderStartEvent) {
79 MakeTypicalCall("testStartAndStartEventTriggered();", kMediaRecorderHtmlFile); 73 MakeTypicalCall("testStartAndStartEventTriggered();", kMediaRecorderHtmlFile);
80 } 74 }
81 75
82 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, 76 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
83 MediaRecorderStopEvent) { 77 MediaRecorderStopEvent) {
84 MakeTypicalCall("testStartStopAndStopEventTriggered();", 78 MakeTypicalCall("testStartStopAndStopEventTriggered();",
(...skipping 15 matching lines...) Expand all
100 MakeTypicalCall("testNoResumeWhileRecorderInactive();", 94 MakeTypicalCall("testNoResumeWhileRecorderInactive();",
101 kMediaRecorderHtmlFile); 95 kMediaRecorderHtmlFile);
102 } 96 }
103 97
104 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest, 98 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcMediaRecorderTest,
105 MediaRecorderResumeAndDataAvailable) { 99 MediaRecorderResumeAndDataAvailable) {
106 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile); 100 MakeTypicalCall("testResumeAndDataAvailable();", kMediaRecorderHtmlFile);
107 } 101 }
108 102
109 } // namespace content 103 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | tools/valgrind/gtest_exclude/content_browsertests.gtest-drmemory.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698