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

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

Issue 821093006: Disable failing EncryptedMediaTest tests. (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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 } 544 }
545 545
546 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { 546 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) {
547 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly); 547 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly);
548 } 548 }
549 549
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.
555 #if defined(OS_LINUX)
556 #define MAYBE_Playback_VP9Video_WebM DISABLED_Playback_VP9Video_WebM
557 #else
558 #define MAYBE_Playback_VP9Video_WebM Playback_VP9Video_WebM
559 #endif
554 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) { 560 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) {
eroman 2014/12/23 18:32:24 Actually, the test name here needs to be changed t
555 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); 561 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly);
556 } 562 }
557 563
564 // Fails on linux debug: http://crbug.com/444827.
565 #if defined(OS_LINUX)
566 #define MAYBE_Playback_AudioOnly_WebM_Opus DISABLED_Playback_AudioOnly_WebM_Opus
567 #else
568 #define MAYBE_Playback_AudioOnly_WebM_Opus Playback_AudioOnly_WebM_Opus
569 #endif
558 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) { 570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) {
559 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly); 571 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly);
560 } 572 }
561 573
562 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { 574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) {
563 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo); 575 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo);
564 } 576 }
565 577
566 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) { 578 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) {
567 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); 579 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo);
568 } 580 }
569 581
570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) { 582 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) {
571 RunInvalidResponseTest(); 583 RunInvalidResponseTest();
572 } 584 }
573 585
574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 586 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
575 if (CurrentSourceType() != MSE || !IsMSESupported()) { 587 if (CurrentSourceType() != MSE || !IsMSESupported()) {
576 DVLOG(0) << "Skipping test - ConfigChange test requires MSE."; 588 DVLOG(0) << "Skipping test - ConfigChange test requires MSE.";
577 return; 589 return;
578 } 590 }
579 if (!IsPlayBackPossible(CurrentKeySystem())) { 591 if (!IsPlayBackPossible(CurrentKeySystem())) {
580 DVLOG(0) << "Skipping test - ConfigChange test requires video playback."; 592 DVLOG(0) << "Skipping test - ConfigChange test requires video playback.";
581 return; 593 return;
582 } 594 }
583 TestConfigChange(); 595 TestConfigChange();
584 } 596 }
585 597
586 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) { 598 // Fails on linux debug: http://crbug.com/444827.
599 #if defined(OS_LINUX)
600 #define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
601 #else
602 #define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
603 #endif
604 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
587 // Times out on Windows XP. http://crbug.com/171937 605 // Times out on Windows XP. http://crbug.com/171937
588 #if defined(OS_WIN) 606 #if defined(OS_WIN)
589 if (base::win::GetVersion() < base::win::VERSION_VISTA) 607 if (base::win::GetVersion() < base::win::VERSION_VISTA)
590 return; 608 return;
591 #endif 609 #endif
592 if (!IsPlayBackPossible(CurrentKeySystem())) { 610 if (!IsPlayBackPossible(CurrentKeySystem())) {
593 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback."; 611 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback.";
594 return; 612 return;
595 } 613 }
596 TestFrameSizeChange(); 614 TestFrameSizeChange();
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 "bear-320x240-v_enc-v.webm", 733 "bear-320x240-v_enc-v.webm",
716 kWebMVideoOnly, 734 kWebMVideoOnly,
717 kExternalClearKeyKeySystem, 735 kExternalClearKeyKeySystem,
718 SRC, 736 SRC,
719 UNPREFIXED, 737 UNPREFIXED,
720 kUnknownSession, 738 kUnknownSession,
721 false, 739 false,
722 kEmeKeyError); 740 kEmeKeyError);
723 } 741 }
724 #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