Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video_engine / test / auto_test / automated / vie_standard_integration_test.cc

diff --git a/src/third_party/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc b/src/third_party/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
index 51208ba..584f9e9 100644 (file)
--- a/src/third_party/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
+++ b/src/third_party/webrtc/video_engine/test/auto_test/automated/vie_standard_integration_test.cc
@@ -51,13 +51,8 @@ TEST_F(ViEStandardIntegrationTest, RunsRenderTestWithoutErrors)  {
   tests_->ViERenderStandardTest();
 }
 
-// Fails on Mac, see https://code.google.com/p/webrtc/issues/detail?id=1790
-#if defined(WEBRTC_MAC)
-#define MAYBE_RunsRtpRtcpTestWithoutErrors DISABLED_RunsRtpRtcpTestWithoutErrors
-#else
-#define MAYBE_RunsRtpRtcpTestWithoutErrors RunsRtpRtcpTestWithoutErrors
-#endif
-TEST_F(ViEStandardIntegrationTest, MAYBE_RunsRtpRtcpTestWithoutErrors)  {
+// Flaky, see webrtc:1790.
+TEST_F(ViEStandardIntegrationTest, DISABLED_RunsRtpRtcpTestWithoutErrors)  {
   tests_->ViERtpRtcpStandardTest();
 }