OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_enumerator.h" | 6 #include "base/files/file_enumerator.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/process/launch.h" | 8 #include "base/process/launch.h" |
9 #include "base/rand_util.h" | 9 #include "base/rand_util.h" |
10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); | 263 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); |
264 | 264 |
265 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); | 265 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); |
266 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); | 266 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); |
267 | 267 |
268 chrome::CloseWebContents(browser(), left_tab, false); | 268 chrome::CloseWebContents(browser(), left_tab, false); |
269 chrome::CloseWebContents(browser(), right_tab, false); | 269 chrome::CloseWebContents(browser(), right_tab, false); |
270 } | 270 } |
271 | 271 |
272 #if defined(OS_LINUX) | 272 #if defined(OS_LINUX) |
273 // So-far unexplained breakage only on bots: http://crbug.com/640628. | 273 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest |
274 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter
opTest | |
275 #else | 274 #else |
276 // Not implemented yet on Windows and Mac. | 275 // Not implemented yet on Windows and Mac. |
277 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter
opTest | 276 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter
opTest |
278 #endif | 277 #endif |
279 | 278 |
280 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, | 279 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, |
281 MAYBE_MANUAL_FirefoxApprtcInteropTest) { | 280 MAYBE_MANUAL_FirefoxApprtcInteropTest) { |
282 DetectErrorsInJavaScript(); | 281 DetectErrorsInJavaScript(); |
283 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); | 282 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); |
284 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); | 283 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); |
(...skipping 12 matching lines...) Expand all Loading... |
297 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT); | 296 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT); |
298 ui_test_utils::NavigateToURL(browser(), room_url); | 297 ui_test_utils::NavigateToURL(browser(), room_url); |
299 | 298 |
300 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); | 299 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); |
301 | 300 |
302 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); | 301 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); |
303 | 302 |
304 // Ensure Firefox manages to send video our way. | 303 // Ensure Firefox manages to send video our way. |
305 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); | 304 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); |
306 } | 305 } |
OLD | NEW |