Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1428)

Side by Side Diff: chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc

Issue 2805523003: Re-enable Firefox interop test. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); 265 ASSERT_TRUE(WaitForCallToComeUp(right_tab));
266 266
267 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); 267 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab));
268 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); 268 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab));
269 269
270 chrome::CloseWebContents(browser(), left_tab, false); 270 chrome::CloseWebContents(browser(), left_tab, false);
271 chrome::CloseWebContents(browser(), right_tab, false); 271 chrome::CloseWebContents(browser(), right_tab, false);
272 } 272 }
273 273
274 #if defined(OS_LINUX) 274 #if defined(OS_LINUX)
275 // Disabled due to failure. http://crbug.com/648181. 275 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest
276 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest
277 #else 276 #else
278 // Not implemented yet on Windows and Mac. 277 // Not implemented yet on Windows and Mac.
279 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest 278 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest
280 #endif 279 #endif
281 280
282 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, 281 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
283 MAYBE_MANUAL_FirefoxApprtcInteropTest) { 282 MAYBE_MANUAL_FirefoxApprtcInteropTest) {
284 DetectErrorsInJavaScript(); 283 DetectErrorsInJavaScript();
285 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); 284 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
286 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); 285 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
(...skipping 12 matching lines...) Expand all
299 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT); 298 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT);
300 ui_test_utils::NavigateToURL(browser(), room_url); 299 ui_test_utils::NavigateToURL(browser(), room_url);
301 300
302 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); 301 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
303 302
304 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); 303 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
305 304
306 // Ensure Firefox manages to send video our way. 305 // Ensure Firefox manages to send video our way.
307 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); 306 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
308 } 307 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698