Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Side by Side Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 821263002: Mark some flaky tests as disabled on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "chrome/browser/media/media_browsertest.h" 10 #include "chrome/browser/media/media_browsertest.h"
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { 550 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) {
551 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); 551 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo);
552 } 552 }
553 553
554 // Fails on linux debug: http://crbug.com/444827. 554 // Fails on linux debug: http://crbug.com/444827.
555 #if defined(OS_LINUX) 555 #if defined(OS_LINUX)
556 #define MAYBE_Playback_VP9Video_WebM DISABLED_Playback_VP9Video_WebM 556 #define MAYBE_Playback_VP9Video_WebM DISABLED_Playback_VP9Video_WebM
557 #else 557 #else
558 #define MAYBE_Playback_VP9Video_WebM Playback_VP9Video_WebM 558 #define MAYBE_Playback_VP9Video_WebM Playback_VP9Video_WebM
559 #endif 559 #endif
560 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) { 560 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_Playback_VP9Video_WebM) {
561 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); 561 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly);
562 } 562 }
563 563
564 // Fails on linux debug: http://crbug.com/444827. 564 // Fails on linux debug: http://crbug.com/444827.
565 #if defined(OS_LINUX) 565 #if defined(OS_LINUX)
566 #define MAYBE_Playback_AudioOnly_WebM_Opus DISABLED_Playback_AudioOnly_WebM_Opus 566 #define MAYBE_Playback_AudioOnly_WebM_Opus DISABLED_Playback_AudioOnly_WebM_Opus
567 #else 567 #else
568 #define MAYBE_Playback_AudioOnly_WebM_Opus Playback_AudioOnly_WebM_Opus 568 #define MAYBE_Playback_AudioOnly_WebM_Opus Playback_AudioOnly_WebM_Opus
569 #endif 569 #endif
570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) { 570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_Playback_AudioOnly_WebM_Opus) {
571 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly); 571 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly);
572 } 572 }
573 573
574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { 574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) {
575 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo); 575 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo);
576 } 576 }
577 577
578 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) { 578 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) {
579 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); 579 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo);
580 } 580 }
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 "bear-320x240-v_enc-v.webm", 733 "bear-320x240-v_enc-v.webm",
734 kWebMVideoOnly, 734 kWebMVideoOnly,
735 kExternalClearKeyKeySystem, 735 kExternalClearKeyKeySystem,
736 SRC, 736 SRC,
737 UNPREFIXED, 737 UNPREFIXED,
738 kUnknownSession, 738 kUnknownSession,
739 false, 739 false,
740 kEmeKeyError); 740 kEmeKeyError);
741 } 741 }
742 #endif // defined(ENABLE_PEPPER_CDMS) 742 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698