| 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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 168 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 169 MAYBE_CanSetupAudioAndVideoCall) { | 169 MAYBE_CanSetupAudioAndVideoCall) { |
| 170 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); | 170 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); |
| 171 } | 171 } |
| 172 | 172 |
| 173 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 173 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 174 MANUAL_CanSetupCallAndSendDtmf) { | 174 MANUAL_CanSetupCallAndSendDtmf) { |
| 175 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); | 175 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); |
| 176 } | 176 } |
| 177 | 177 |
| 178 // TODO(phoglund): this test fails because the peer connection state will be | |
| 179 // stable in the second negotiation round rather than have-local-offer. | |
| 180 // http://crbug.com/293125. | |
| 181 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 178 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 182 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { | 179 CanMakeEmptyCallThenAddStreamsAndRenegotiate) { |
| 183 const char* kJavascript = | 180 const char* kJavascript = |
| 184 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; | 181 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; |
| 185 MakeTypicalPeerConnectionCall(kJavascript); | 182 MakeTypicalPeerConnectionCall(kJavascript); |
| 186 } | 183 } |
| 187 | 184 |
| 188 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 185 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
| 189 CanMakeAudioCallAndThenRenegotiateToVideo) { | 186 CanMakeAudioCallAndThenRenegotiateToVideo) { |
| 190 const char* kJavascript = | 187 const char* kJavascript = |
| 191 "callAndRenegotiateToVideo({audio: true}, {audio: true, video:true});"; | 188 "callAndRenegotiateToVideo({audio: true}, {audio: true, video:true});"; |
| 192 MakeTypicalPeerConnectionCall(kJavascript); | 189 MakeTypicalPeerConnectionCall(kJavascript); |
| (...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 443 | 440 |
| 444 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { | 441 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallAndVerifyVideoMutingWorks) { |
| 445 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); | 442 MakeTypicalPeerConnectionCall("callAndEnsureVideoTrackMutingWorks();"); |
| 446 } | 443 } |
| 447 | 444 |
| 448 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { | 445 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { |
| 449 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); | 446 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); |
| 450 } | 447 } |
| 451 | 448 |
| 452 } // namespace content | 449 } // namespace content |
| OLD | NEW |