| 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/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "content/browser/web_contents/web_contents_impl.h" | 8 #include "content/browser/web_contents/web_contents_impl.h" |
| 9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 10 #include "content/public/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 NavigateToURL(shell(), url); | 210 NavigateToURL(shell(), url); |
| 211 | 211 |
| 212 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();")); | 212 EXPECT_TRUE(ExecuteJavascript("callWithDataAndMedia();")); |
| 213 ExpectTitle("OK"); | 213 ExpectTitle("OK"); |
| 214 } | 214 } |
| 215 | 215 |
| 216 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) | 216 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(ARCH_CPU_ARM_FAMILY) |
| 217 // Timing out on ARM linux bot: http://crbug.com/238490 | 217 // Timing out on ARM linux bot: http://crbug.com/238490 |
| 218 #define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia | 218 #define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia |
| 219 #else | 219 #else |
| 220 #define MAYBE_CallWithDataAndLaterAddMedia CallWithDataAndLaterAddMedia | 220 // Temporarily disable the test on all platforms. http://crbug.com/293252 |
| 221 #define MAYBE_CallWithDataAndLaterAddMedia DISABLED_CallWithDataAndLaterAddMedia |
| 221 #endif | 222 #endif |
| 222 | 223 |
| 223 // This test will make a PeerConnection-based call and test an unreliable text | 224 // This test will make a PeerConnection-based call and test an unreliable text |
| 224 // dataChannel and later add an audio and video track. | 225 // dataChannel and later add an audio and video track. |
| 225 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) { | 226 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, MAYBE_CallWithDataAndLaterAddMedia) { |
| 226 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | 227 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |
| 227 NavigateToURL(shell(), url); | 228 NavigateToURL(shell(), url); |
| 228 | 229 |
| 229 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();")); | 230 EXPECT_TRUE(ExecuteJavascript("callWithDataAndLaterAddMedia();")); |
| 230 ExpectTitle("OK"); | 231 ExpectTitle("OK"); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 317 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) { | 318 IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, AddTwoMediaStreamsToOnePC) { |
| 318 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); | 319 GURL url(embedded_test_server()->GetURL("/media/peerconnection-call.html")); |
| 319 NavigateToURL(shell(), url); | 320 NavigateToURL(shell(), url); |
| 320 | 321 |
| 321 EXPECT_TRUE( | 322 EXPECT_TRUE( |
| 322 ExecuteJavascript("addTwoMediaStreamsToOneConnection();")); | 323 ExecuteJavascript("addTwoMediaStreamsToOneConnection();")); |
| 323 ExpectTitle("OK"); | 324 ExpectTitle("OK"); |
| 324 } | 325 } |
| 325 | 326 |
| 326 } // namespace content | 327 } // namespace content |
| OLD | NEW |