summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorbrianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 07:23:02 +0000
committerbrianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-06 07:23:02 +0000
commit00c88f389c58c04dff6fd3a1456e928235209d27 (patch)
treecf991e863b090474c73afcd8f00b7449d2f85fbb /content
parent4f861434696d4153ef1f1ac3a0c57f51b0b00a6e (diff)
downloadchromium_src-00c88f389c58c04dff6fd3a1456e928235209d27.zip
chromium_src-00c88f389c58c04dff6fd3a1456e928235209d27.tar.gz
chromium_src-00c88f389c58c04dff6fd3a1456e928235209d27.tar.bz2
Disable EncryptedMediaTest.FrameChangeVideo on Linux
It was causing linux bots to always fail. BUG=174548 TBR=jamesr@chromium.org Review URL: https://chromiumcodereview.appspot.com/12221035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/media/encrypted_media_browsertest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/browser/media/encrypted_media_browsertest.cc b/content/browser/media/encrypted_media_browsertest.cc
index 45bd912..1956040 100644
--- a/content/browser/media/encrypted_media_browsertest.cc
+++ b/content/browser/media/encrypted_media_browsertest.cc
@@ -160,9 +160,11 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback_VideoClearAudio) {
GetParam(), kExpected));
}
+#if !defined(OS_LINUX)
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
const string16 kExpected = ASCIIToUTF16("ENDED");
ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
}
+#endif
} // namespace content