Chromium Code Reviews| 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 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 225 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions()); | 225 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions()); |
| 226 return firefox_.IsValid(); | 226 return firefox_.IsValid(); |
| 227 } | 227 } |
| 228 | 228 |
| 229 private: | 229 private: |
| 230 base::Process dev_appserver_; | 230 base::Process dev_appserver_; |
| 231 base::Process firefox_; | 231 base::Process firefox_; |
| 232 base::Process collider_server_; | 232 base::Process collider_server_; |
| 233 }; | 233 }; |
| 234 | 234 |
| 235 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { | 235 // Disabling while the AppRTC application is being fixed. |
|
phoglund_chromium
2015/03/17 08:35:13
Refer to https://crbug.com/467471
| |
| 236 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, DISABLED_MANUAL_WorksOnApprtc) { | |
| 236 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. | 237 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. |
| 237 if (OnWinXp()) | 238 if (OnWinXp()) |
| 238 return; | 239 return; |
| 239 | 240 |
| 240 DetectErrorsInJavaScript(); | 241 DetectErrorsInJavaScript(); |
| 241 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); | 242 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); |
| 242 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); | 243 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); |
| 243 while (!LocalApprtcInstanceIsUp()) | 244 while (!LocalApprtcInstanceIsUp()) |
| 244 DVLOG(1) << "Waiting for AppRTC to come up..."; | 245 DVLOG(1) << "Waiting for AppRTC to come up..."; |
| 245 | 246 |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 256 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); | 257 ASSERT_TRUE(WaitForCallToComeUp(right_tab)); |
| 257 | 258 |
| 258 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); | 259 ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab)); |
| 259 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); | 260 ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab)); |
| 260 | 261 |
| 261 chrome::CloseWebContents(browser(), left_tab, false); | 262 chrome::CloseWebContents(browser(), left_tab, false); |
| 262 chrome::CloseWebContents(browser(), right_tab, false); | 263 chrome::CloseWebContents(browser(), right_tab, false); |
| 263 } | 264 } |
| 264 | 265 |
| 265 #if defined(OS_LINUX) | 266 #if defined(OS_LINUX) |
| 266 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest | 267 // Disabling while the AppRTC application is being fixed. |
| 268 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest | |
| 267 #else | 269 #else |
| 268 // Not implemented yet on Windows and Mac. | 270 // Not implemented yet on Windows and Mac. |
| 269 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest | 271 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInter opTest |
| 270 #endif | 272 #endif |
| 271 | 273 |
| 272 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, | 274 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, |
| 273 MAYBE_MANUAL_FirefoxApprtcInteropTest) { | 275 MAYBE_MANUAL_FirefoxApprtcInteropTest) { |
| 274 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. | 276 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. |
| 275 if (OnWinXp()) | 277 if (OnWinXp()) |
| 276 return; | 278 return; |
| 277 | 279 |
| 278 DetectErrorsInJavaScript(); | 280 DetectErrorsInJavaScript(); |
| 279 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); | 281 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); |
| 280 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); | 282 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); |
| 281 while (!LocalApprtcInstanceIsUp()) | 283 while (!LocalApprtcInstanceIsUp()) |
| 282 DVLOG(1) << "Waiting for AppRTC to come up..."; | 284 DVLOG(1) << "Waiting for AppRTC to come up..."; |
| 283 | 285 |
| 284 GURL room_url = GURL("http://localhost:9999/r/some_room" | 286 GURL room_url = GURL("http://localhost:9999/r/some_room" |
| 285 "?wshpp=localhost:8089&wstls=false" | 287 "?wshpp=localhost:8089&wstls=false" |
| 286 "&firefox_fake_device=1"); | 288 "&firefox_fake_device=1"); |
| 287 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); | 289 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); |
| 288 | 290 |
| 289 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); | 291 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); |
| 290 | 292 |
| 291 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); | 293 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); |
| 292 | 294 |
| 293 // Ensure Firefox manages to send video our way. | 295 // Ensure Firefox manages to send video our way. |
| 294 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); | 296 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); |
| 295 } | 297 } |
| OLD | NEW |