| 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/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/process/process_handle.h" | 7 #include "base/process/process_handle.h" |
| 8 #include "base/strings/string_number_conversions.h" | 8 #include "base/strings/string_number_conversions.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/threading/platform_thread.h" | 10 #include "base/threading/platform_thread.h" |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 #endif | 147 #endif |
| 148 | 148 |
| 149 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { | 149 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MAYBE_CanSetupAudioAndVideoCall) { |
| 150 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); | 150 MakeTypicalPeerConnectionCall("call({video: true, audio: true});"); |
| 151 } | 151 } |
| 152 | 152 |
| 153 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { | 153 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, MANUAL_CanSetupCallAndSendDtmf) { |
| 154 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); | 154 MakeTypicalPeerConnectionCall("callAndSendDtmf(\'123,abc\');"); |
| 155 } | 155 } |
| 156 | 156 |
| 157 // TODO(phoglund): this test fails because the peer connection state will be |
| 158 // stable in the second negotiation round rather than have-local-offer. |
| 159 // http://crbug.com/293125. |
| 157 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, | 160 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, |
| 158 CanMakeEmptyCallThenAddStreamsAndRenegotiate) { | 161 DISABLED_CanMakeEmptyCallThenAddStreamsAndRenegotiate) { |
| 159 const char* kJavascript = | 162 const char* kJavascript = |
| 160 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; | 163 "callEmptyThenAddOneStreamAndRenegotiate({video: true, audio: true});"; |
| 161 MakeTypicalPeerConnectionCall(kJavascript); | 164 MakeTypicalPeerConnectionCall(kJavascript); |
| 162 } | 165 } |
| 163 | 166 |
| 164 // Below 2 test will make a complete PeerConnection-based call between pc1 and | 167 // Below 2 test will make a complete PeerConnection-based call between pc1 and |
| 165 // pc2, and then use the remote stream to setup a call between pc3 and pc4, and | 168 // pc2, and then use the remote stream to setup a call between pc3 and pc4, and |
| 166 // then verify that video is received on pc3 and pc4. | 169 // then verify that video is received on pc3 and pc4. |
| 167 // The stream sent from pc3 to pc4 is the stream received on pc1. | 170 // The stream sent from pc3 to pc4 is the stream received on pc1. |
| 168 // The stream sent from pc4 to pc3 is cloned from stream the stream received | 171 // The stream sent from pc4 to pc3 is cloned from stream the stream received |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 | 538 |
| 536 base::DeleteFile(unique_dump_file, false); | 539 base::DeleteFile(unique_dump_file, false); |
| 537 } | 540 } |
| 538 } | 541 } |
| 539 | 542 |
| 540 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) { | 543 IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, CreateOfferWithOfferOptions) { |
| 541 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); | 544 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); |
| 542 } | 545 } |
| 543 | 546 |
| 544 } // namespace content | 547 } // namespace content |
| OLD | NEW |