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

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

Issue 1141533002: Revert of Disabled WebRtcBrowserTest.CanSetupCallAndSendDtmf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/files/file_util.h" 6 #include "base/files/file_util.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/threading/platform_thread.h" 8 #include "base/threading/platform_thread.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall 157 #define MAYBE_CanSetupAudioAndVideoCall DISABLED_CanSetupAudioAndVideoCall
158 #else 158 #else
159 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall 159 #define MAYBE_CanSetupAudioAndVideoCall CanSetupAudioAndVideoCall
160 #endif 160 #endif
161 161
162 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, 162 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
163 MAYBE_CanSetupAudioAndVideoCall) { 163 MAYBE_CanSetupAudioAndVideoCall) {
164 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); 164 MakeTypicalPeerConnectionCall("call({video: true, audio: true});");
165 } 165 }
166 166
167 // TODO(henrika): see crbug.com/486654 for details why this test fails.
168 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, 167 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
169 DISABLED_CanSetupCallAndSendDtmf) { 168 MANUAL_CanSetupCallAndSendDtmf) {
170 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); 169 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');");
171 } 170 }
172 171
173 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, 172 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
174 CanMakeEmptyCallThenAddStreamsAndRenegotiate) { 173 CanMakeEmptyCallThenAddStreamsAndRenegotiate) {
175 const char* kJavascript = 174 const char* kJavascript =
176 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; 175 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});";
177 MakeTypicalPeerConnectionCall(kJavascript); 176 MakeTypicalPeerConnectionCall(kJavascript);
178 } 177 }
179 178
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 414
416 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { 415 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) {
417 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); 416 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();");
418 } 417 }
419 418
420 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { 419 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) {
421 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); 420 MakeTypicalPeerConnectionCall("testCreateOfferOptions();");
422 } 421 }
423 422
424 } // namespace content 423 } // 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