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

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

Issue 823023002: Revert of Disable failing EncryptedMediaTest tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
560 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) { 554 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) {
561 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); 555 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly);
562 } 556 }
563 557
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
570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) { 558 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) {
571 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly); 559 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMAudioOnly);
572 } 560 }
573 561
574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { 562 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) {
575 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo); 563 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo);
576 } 564 }
577 565
578 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) { 566 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) {
579 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); 567 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo);
580 } 568 }
581 569
582 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) { 570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) {
583 RunInvalidResponseTest(); 571 RunInvalidResponseTest();
584 } 572 }
585 573
586 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
587 if (CurrentSourceType() != MSE || !IsMSESupported()) { 575 if (CurrentSourceType() != MSE || !IsMSESupported()) {
588 DVLOG(0) << "Skipping test - ConfigChange test requires MSE."; 576 DVLOG(0) << "Skipping test - ConfigChange test requires MSE.";
589 return; 577 return;
590 } 578 }
591 if (!IsPlayBackPossible(CurrentKeySystem())) { 579 if (!IsPlayBackPossible(CurrentKeySystem())) {
592 DVLOG(0) << "Skipping test - ConfigChange test requires video playback."; 580 DVLOG(0) << "Skipping test - ConfigChange test requires video playback.";
593 return; 581 return;
594 } 582 }
595 TestConfigChange(); 583 TestConfigChange();
596 } 584 }
597 585
598 // Fails on linux debug: http://crbug.com/444827. 586 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
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) {
605 // Times out on Windows XP. http://crbug.com/171937 587 // Times out on Windows XP. http://crbug.com/171937
606 #if defined(OS_WIN) 588 #if defined(OS_WIN)
607 if (base::win::GetVersion() < base::win::VERSION_VISTA) 589 if (base::win::GetVersion() < base::win::VERSION_VISTA)
608 return; 590 return;
609 #endif 591 #endif
610 if (!IsPlayBackPossible(CurrentKeySystem())) { 592 if (!IsPlayBackPossible(CurrentKeySystem())) {
611 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback."; 593 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback.";
612 return; 594 return;
613 } 595 }
614 TestFrameSizeChange(); 596 TestFrameSizeChange();
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 "bear-320x240-v_enc-v.webm", 715 "bear-320x240-v_enc-v.webm",
734 kWebMVideoOnly, 716 kWebMVideoOnly,
735 kExternalClearKeyKeySystem, 717 kExternalClearKeyKeySystem,
736 SRC, 718 SRC,
737 UNPREFIXED, 719 UNPREFIXED,
738 kUnknownSession, 720 kUnknownSession,
739 false, 721 false,
740 kEmeKeyError); 722 kEmeKeyError);
741 } 723 }
742 #endif // defined(ENABLE_PEPPER_CDMS) 724 #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