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

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

Issue 463933002: Disable MSE_ClearKey/EncryptedMediaTest.Playback_VP9Video_WebM/0 as its failing often. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« 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 515 matching lines...) Expand 10 before | Expand all | Expand 10 after
526 } 526 }
527 527
528 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { 528 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) {
529 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly); 529 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVideoOnly);
530 } 530 }
531 531
532 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { 532 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) {
533 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo); 533 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMAudioVideo);
534 } 534 }
535 535
536 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) { 536 // http://crbug.com/402766
537 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_Playback_VP9Video_WebM) {
537 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); 538 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly);
538 } 539 }
539 540
540 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) { 541 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) {
541 RunInvalidResponseTest(); 542 RunInvalidResponseTest();
542 } 543 }
543 544
544 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 545 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
545 if (CurrentSourceType() != MSE || !IsMSESupported()) { 546 if (CurrentSourceType() != MSE || !IsMSESupported()) {
546 VLOG(0) << "Skipping test - ConfigChange test requires MSE."; 547 VLOG(0) << "Skipping test - ConfigChange test requires MSE.";
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 "bear-320x240-v_enc-v.webm", 660 "bear-320x240-v_enc-v.webm",
660 kWebMVideoOnly, 661 kWebMVideoOnly,
661 kExternalClearKeyKeySystem, 662 kExternalClearKeyKeySystem,
662 SRC, 663 SRC,
663 PREFIXED, 664 PREFIXED,
664 kUnknownSession, 665 kUnknownSession,
665 false, 666 false,
666 kEmeKeyError); 667 kEmeKeyError);
667 } 668 }
668 #endif // defined(ENABLE_PEPPER_CDMS) 669 #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