| 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/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "content/browser/web_contents/web_contents_impl.h" | 7 #include "content/browser/web_contents/web_contents_impl.h" |
| 8 #include "content/public/common/content_switches.h" | 8 #include "content/public/common/content_switches.h" |
| 9 #include "content/public/test/browser_test_utils.h" | 9 #include "content/public/test/browser_test_utils.h" |
| 10 #include "content/shell/shell.h" | 10 #include "content/shell/shell.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) { | 107 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, CallWithDataAndMedia) { |
| 108 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); | 108 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); |
| 109 NavigateToURL(shell(), url); | 109 NavigateToURL(shell(), url); |
| 110 | 110 |
| 111 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();")); | 111 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();")); |
| 112 ExpectTitle("OK"); | 112 ExpectTitle("OK"); |
| 113 } | 113 } |
| 114 | 114 |
| 115 // This test will make a PeerConnection-based call and test an unreliable text | 115 // This test will make a PeerConnection-based call and test an unreliable text |
| 116 // dataChannel and later add an audio and video track. | 116 // dataChannel and later add an audio and video track. |
| 117 #if defined(OS_LINUX) | 117 // Flaky. http://crbug.com/175683 |
| 118 // Flaky on Linux. http://crbug.com/175683 | 118 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, |
| 119 #define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia | 119 DISABLED_CallWithDataAndLaterAddMedia) { |
| 120 #else | |
| 121 #define MAYBE_CallWithDataAndLaterAddMedia CallWithDataAndLaterAddMedia | |
| 122 #endif | |
| 123 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) { | |
| 124 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); | 120 GURL url(test_server()->GetURL("files/media/peerconnection-call.html")); |
| 125 NavigateToURL(shell(), url); | 121 NavigateToURL(shell(), url); |
| 126 | 122 |
| 127 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();")); | 123 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();")); |
| 128 ExpectTitle("OK"); | 124 ExpectTitle("OK"); |
| 129 } | 125 } |
| 130 | 126 |
| 131 } // namespace content | 127 } // namespace content |
| 132 | 128 |
| OLD | NEW |