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

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

Issue 232273002: Reenable disabled Widevine playback tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 #if !defined(WIDEVINE_CDM_IS_COMPONENT) 500 #if !defined(WIDEVINE_CDM_IS_COMPONENT)
501 INSTANTIATE_TEST_CASE_P(MSE_Widevine, 501 INSTANTIATE_TEST_CASE_P(MSE_Widevine,
502 EncryptedMediaTest, 502 EncryptedMediaTest,
503 Combine(Values(kWidevineKeySystem), 503 Combine(Values(kWidevineKeySystem),
504 Values(MSE), 504 Values(MSE),
505 Values(UNPREFIXED))); 505 Values(UNPREFIXED)));
506 #endif // !defined(WIDEVINE_CDM_IS_COMPONENT) 506 #endif // !defined(WIDEVINE_CDM_IS_COMPONENT)
507 #endif // defined(WIDEVINE_CDM_AVAILABLE) 507 #endif // defined(WIDEVINE_CDM_AVAILABLE)
508 508
509 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) { 509 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM) {
510 #if defined(WIDEVINE_CDM_AVAILABLE)
511 if (IsWidevine(CurrentKeySystem())) {
512 VLOG(0) << "Test disabled on Widevine key system, crbug.com/349526.";
513 return;
514 }
515 #endif
516 TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly); 510 TestSimplePlayback("bear-a-enc_a.webm", kWebMAudioOnly);
517 } 511 }
518 512
519 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) { 513 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioClearVideo_WebM) {
520 #if defined(WIDEVINE_CDM_AVAILABLE)
521 if (IsWidevine(CurrentKeySystem())) {
522 VLOG(0) << "Test disabled on Widevine key system, crbug.com/349526.";
523 return;
524 }
525 #endif
526 TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo); 514 TestSimplePlayback("bear-320x240-av-enc_a.webm", kWebMAudioVideo);
527 } 515 }
528 516
529 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM) { 517 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM) {
530 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo); 518 TestSimplePlayback("bear-320x240-av-enc_av.webm", kWebMAudioVideo);
531 } 519 }
532 520
533 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { 521 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) {
534 TestSimplePlayback("bear-320x240-v-enc_v.webm", kWebMVideoOnly); 522 TestSimplePlayback("bear-320x240-v-enc_v.webm", kWebMVideoOnly);
535 } 523 }
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
658 "bear-320x240-v-enc_v.webm", 646 "bear-320x240-v-enc_v.webm",
659 kWebMVideoOnly, 647 kWebMVideoOnly,
660 kExternalClearKeyKeySystem, 648 kExternalClearKeyKeySystem,
661 SRC, 649 SRC,
662 PREFIXED, 650 PREFIXED,
663 kUnknownSession, 651 kUnknownSession,
664 false, 652 false,
665 kEmeKeyError); 653 kEmeKeyError);
666 } 654 }
667 #endif // defined(ENABLE_PEPPER_CDMS) 655 #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