Index: webrtc/video/full_stack.cc |
diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc |
index a11b799a438294a9490872caea4e5957067edbdf..8511b8281e91ab97f3b655302760d053fc0d1404 100644 |
--- a/webrtc/video/full_stack.cc |
+++ b/webrtc/video/full_stack.cc |
@@ -118,10 +118,7 @@ TEST_F(FullStackTest, ForemanCif1000kbps100msLimitedQueue) { |
RunTest(foreman_cif); |
} |
-// Temporarily disabled on Android due to low test timeouts. |
-// https://code.google.com/p/chromium/issues/detail?id=513170 |
-#include "webrtc/test/testsupport/gtest_disable.h" |
-TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL)) { |
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL) { |
VideoQualityTest::Params screenshare = { |
{1850, 1110, 5, 50000, 200000, 2000000, "VP8", 2, 400000}, |
{}, // Video-specific. |
@@ -130,7 +127,7 @@ TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL)) { |
RunTest(screenshare); |
} |
-TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL_Scroll)) { |
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll) { |
VideoQualityTest::Params config = { |
{1850, 1110 / 2, 5, 50000, 200000, 2000000, "VP8", 2, 400000}, |
{}, |
@@ -139,8 +136,7 @@ TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL_Scroll)) { |
RunTest(config); |
} |
-// Disabled on Android along with VP8 screenshare above. |
-TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP9_2TL)) { |
+TEST_F(FullStackTest, ScreenshareSlidesVP9_2TL) { |
VideoQualityTest::Params screenshare = { |
{1850, 1110, 5, 50000, 200000, 2000000, "VP9", 2, 400000}, |
{}, |