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/threading/thread_restrictions.h" |
10 #include "build/build_config.h" | 11 #include "build/build_config.h" |
11 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
12 #include "chrome/browser/infobars/infobar_responder.h" | 13 #include "chrome/browser/infobars/infobar_responder.h" |
13 #include "chrome/browser/infobars/infobar_service.h" | 14 #include "chrome/browser/infobars/infobar_service.h" |
14 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h" | 15 #include "chrome/browser/media/webrtc/webrtc_browsertest_base.h" |
15 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h" | 16 #include "chrome/browser/media/webrtc/webrtc_browsertest_common.h" |
16 #include "chrome/browser/permissions/permission_request_manager.h" | 17 #include "chrome/browser/permissions/permission_request_manager.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/browser/ui/browser_tabstrip.h" | 19 #include "chrome/browser/ui/browser_tabstrip.h" |
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 20 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 return firefox_.IsValid(); | 226 return firefox_.IsValid(); |
226 } | 227 } |
227 | 228 |
228 private: | 229 private: |
229 base::Process dev_appserver_; | 230 base::Process dev_appserver_; |
230 base::Process firefox_; | 231 base::Process firefox_; |
231 base::Process collider_server_; | 232 base::Process collider_server_; |
232 }; | 233 }; |
233 | 234 |
234 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { | 235 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { |
| 236 base::ThreadRestrictions::ScopedAllowIO allow_io; |
235 DetectErrorsInJavaScript(); | 237 DetectErrorsInJavaScript(); |
236 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); | 238 ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); |
237 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); | 239 ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); |
238 while (!LocalApprtcInstanceIsUp()) | 240 while (!LocalApprtcInstanceIsUp()) |
239 DVLOG(1) << "Waiting for AppRTC to come up..."; | 241 DVLOG(1) << "Waiting for AppRTC to come up..."; |
240 | 242 |
241 GURL room_url = GURL("http://localhost:9999/r/some_room" | 243 GURL room_url = GURL("http://localhost:9999/r/some_room" |
242 "?wshpp=localhost:8089&wstls=false"); | 244 "?wshpp=localhost:8089&wstls=false"); |
243 | 245 |
244 // Set up the left tab. | 246 // Set up the left tab. |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT); | 300 InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT); |
299 ui_test_utils::NavigateToURL(browser(), room_url); | 301 ui_test_utils::NavigateToURL(browser(), room_url); |
300 | 302 |
301 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); | 303 ASSERT_TRUE(LaunchFirefoxWithUrl(room_url)); |
302 | 304 |
303 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); | 305 ASSERT_TRUE(WaitForCallToComeUp(chrome_tab)); |
304 | 306 |
305 // Ensure Firefox manages to send video our way. | 307 // Ensure Firefox manages to send video our way. |
306 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); | 308 ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab)); |
307 } | 309 } |
OLD | NEW |