| OLD | NEW |
| 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 Loading... |
| 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. |
| 167 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 168 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 168 MANUAL_CanSetupCallAndSendDtmf) { | 169 DISABLED_CanSetupCallAndSendDtmf) { |
| 169 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); | 170 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); |
| 170 } | 171 } |
| 171 | 172 |
| 172 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 173 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 173 CanMakeEmptyCallThenAddStreamsAndRenegotiate) { | 174 CanMakeEmptyCallThenAddStreamsAndRenegotiate) { |
| 174 const char* kJavascript = | 175 const char* kJavascript = |
| 175 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; | 176 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; |
| 176 MakeTypicalPeerConnectionCall(kJavascript); | 177 MakeTypicalPeerConnectionCall(kJavascript); |
| 177 } | 178 } |
| 178 | 179 |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 414 | 415 |
| 415 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { | 416 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { |
| 416 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); | 417 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); |
| 417 } | 418 } |
| 418 | 419 |
| 419 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { | 420 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { |
| 420 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); | 421 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); |
| 421 } | 422 } |
| 422 | 423 |
| 423 } // namespace content | 424 } // namespace content |
| OLD | NEW |