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/threading/platform_thread.h" | 7 #include "base/threading/platform_thread.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "content/browser/web_contents/web_contents_impl.h" | 9 #include "content/browser/web_contents/web_contents_impl.h" |
10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" | 10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 protected: | 42 protected: |
43 // Convenience function since most peerconnection-call.html tests just load | 43 // Convenience function since most peerconnection-call.html tests just load |
44 // the page, kick off some javascript and wait for the title to change to OK. | 44 // the page, kick off some javascript and wait for the title to change to OK. |
45 void MakeTypicalPeerConnectionCall(const std::string& javascript) { | 45 void MakeTypicalPeerConnectionCall(const std::string& javascript) { |
46 MakeTypicalCall(javascript, "/media/peerconnection-call.html"); | 46 MakeTypicalCall(javascript, "/media/peerconnection-call.html"); |
47 } | 47 } |
48 | 48 |
49 void SetConfigurationTest(const std::string& javascript) { | 49 void SetConfigurationTest(const std::string& javascript) { |
50 // This doesn't actually "make a call", it just loads the page, executes | 50 // This doesn't actually "make a call", it just loads the page, executes |
51 // the javascript and waits for "OK". | 51 // the javascript and waits for "OK". |
52 MakeTypicalCall(javascript, "/media/peerconnection-setConfiguration.html"); | 52 MakeTypicalCall(javascript, |
| 53 "/media/peerconnection-setAndGetConfiguration.html"); |
53 } | 54 } |
54 }; | 55 }; |
55 | 56 |
56 // These tests will make a complete PeerConnection-based call and verify that | 57 // These tests will make a complete PeerConnection-based call and verify that |
57 // video is playing for the call. | 58 // video is playing for the call. |
58 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, | 59 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, |
59 CanSetupDefaultVideoCall) { | 60 CanSetupDefaultVideoCall) { |
60 MakeTypicalPeerConnectionCall( | 61 MakeTypicalPeerConnectionCall( |
61 "callAndExpectResolution({video: true}, 640, 480);"); | 62 "callAndExpectResolution({video: true}, 640, 480);"); |
62 } | 63 } |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
202 | 203 |
203 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { | 204 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CreateOfferWithOfferOptions) { |
204 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); | 205 MakeTypicalPeerConnectionCall("testCreateOfferOptions();"); |
205 } | 206 } |
206 | 207 |
207 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallInsideIframe) { | 208 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, CallInsideIframe) { |
208 MakeTypicalPeerConnectionCall("callInsideIframe({video: true, audio:true});"); | 209 MakeTypicalPeerConnectionCall("callInsideIframe({video: true, audio:true});"); |
209 } | 210 } |
210 | 211 |
211 // Tests that SetConfiguration succeeds and triggers an ICE restart on the next | 212 // Tests that SetConfiguration succeeds and triggers an ICE restart on the next |
212 // offer as described by JSEP. | 213 // offer as described by JSEP. Also tests that GetConfiguration() succeeds. |
213 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, SetConfiguration) { | 214 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, SetAndGetConfiguration) { |
214 SetConfigurationTest("testSetConfiguration();"); | 215 SetConfigurationTest("testSetAndGetConfiguration();"); |
215 } | 216 } |
216 | 217 |
217 // Tests the error conditions of SetConfiguration as described by webrtc-pc. | 218 // Tests the error conditions of SetConfiguration as described by webrtc-pc. |
218 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, SetConfigurationErrors) { | 219 IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, SetConfigurationErrors) { |
219 SetConfigurationTest("testSetConfigurationErrors();"); | 220 SetConfigurationTest("testSetConfigurationErrors();"); |
220 } | 221 } |
221 | 222 |
222 } // namespace content | 223 } // namespace content |
OLD | NEW |