Commit 60ec1e64 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Don't attempt WebRTC H264 test w/o proprietary codecs.

Fixes broken ToTAndroidCFI bot after http://crrev.com/558826.

BUG=842890
TEST=none
TBR=emircan

Change-Id: I1aba2e491b34d71910430bfd4d2d6cba55045889
Reviewed-on: https://chromium-review.googlesource.com/1062802Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559316}
parent d680078a
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "content/public/test/test_utils.h" #include "content/public/test/test_utils.h"
#include "media/audio/audio_manager.h" #include "media/audio/audio_manager.h"
#include "media/base/media_switches.h" #include "media/base/media_switches.h"
#include "media/media_buildflags.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
namespace content { namespace content {
...@@ -232,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, ...@@ -232,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
"testGetSettingsWhenRemoteDimensionsUnknown();"); "testGetSettingsWhenRemoteDimensionsUnknown();");
} }
#if defined(OS_ANDROID) #if defined(OS_ANDROID) && BUILDFLAG(USE_PROPRIETARY_CODECS)
// This test is to make sure HW H264 work normally on supported devices, since // This test is to make sure HW H264 work normally on supported devices, since
// there is no SW H264 fallback available on Android. // there is no SW H264 fallback available on Android.
IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest, IN_PROC_BROWSER_TEST_F(MAYBE_WebRtcBrowserTest,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment