Chromium Code Reviews| Index: chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc |
| diff --git a/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc b/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc |
| index a23308cbaf86cf5b2c742684866f12146109c2f0..2a9809f71333f6da632e10fcfdb630b33ecbb1a7 100644 |
| --- a/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc |
| +++ b/chrome/browser/media/webrtc/webrtc_apprtc_browsertest.cc |
| @@ -25,6 +25,10 @@ |
| #include "net/test/python_utils.h" |
| #include "ui/gl/gl_switches.h" |
| +#if defined(OS_MACOSX) |
|
jam
2017/04/27 01:06:41
nit: no need to ifdef this
emircan
2017/04/27 01:26:47
Done.
|
| +#include "base/threading/thread_restrictions.h" |
| +#endif // defined(OS_MACOSX) |
| + |
| const char kTitlePageOfAppEngineAdminPage[] = "Instances"; |
| const char kIsApprtcCallUpJavascript[] = |
| @@ -232,6 +236,10 @@ class WebRtcApprtcBrowserTest : public WebRtcTestBase { |
| }; |
| IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { |
| +// crbug.com/684680 |
| +#if defined(OS_MACOSX) |
|
jam
2017/04/27 01:06:41
I'm a bit surprised that this code and other tests
emircan
2017/04/27 01:26:47
Done. It turns out that win is also using this: ht
|
| + base::ThreadRestrictions::ScopedAllowIO allow_io; |
| +#endif // defined(OS_MACOSX) |
| DetectErrorsInJavaScript(); |
| ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999")); |
| ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089")); |