| 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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions()); | 219 firefox_ = base::LaunchProcess(command_line, base::LaunchOptions()); |
| 220 return firefox_.IsValid(); | 220 return firefox_.IsValid(); |
| 221 } | 221 } |
| 222 | 222 |
| 223 private: | 223 private: |
| 224 base::Process dev_appserver_; | 224 base::Process dev_appserver_; |
| 225 base::Process firefox_; | 225 base::Process firefox_; |
| 226 base::Process collider_server_; | 226 base::Process collider_server_; |
| 227 }; | 227 }; |
| 228 | 228 |
| 229 #if defined(OS_WIN) | 229 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { |
| 230 // Disabled due to https://github.com/webrtc/apprtc/issues/48. | |
| 231 #define MAYBE_MANUAL_WorksOnApprtc DISABLED_MANUAL_WorksOnApprtc | |
| 232 #else | |
| 233 #define MAYBE_MANUAL_WorksOnApprtc MANUAL_WorksOnApprtc | |
| 234 #endif | |
| 235 | |
| 236 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MAYBE_MANUAL_WorksOnApprtc) { | |
| 237 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. | 230 // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703. |
| 238 if (OnWinXp()) | 231 if (OnWinXp()) |
| 239 return; | 232 return; |
| 240 | 233 |
| 241 DetectErrorsInJavaScript(); | 234 DetectErrorsInJavaScript(); |
| 242 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); | 235 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); |
| 243 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); | 236 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); |
| 244 while (!LocalApprtcInstanceIsUp()) | 237 while (!LocalApprtcInstanceIsUp()) |
| 245 DVLOG(1) << "Waiting for AppRTC to come up..."; | 238 DVLOG(1) << "Waiting for AppRTC to come up..."; |
| 246 | 239 |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 "&firefox_fake_device=1"); | 280 "&firefox_fake_device=1"); |
| 288 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); | 281 content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(room_url); |
| 289 | 282 |
| 290 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); | 283 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); |
| 291 | 284 |
| 292 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); | 285 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); |
| 293 | 286 |
| 294 // Ensure Firefox manages to send video our way. | 287 // Ensure Firefox manages to send video our way. |
| 295 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); | 288 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); |
| 296 } | 289 } |
| OLD | NEW |