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

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

Issue 1102363005: Initialize the CDM asynchronously (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Create() changes Created 5 years, 7 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
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 635 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 // The parent key system cannot be used when creating MediaKeys. 646 // The parent key system cannot be used when creating MediaKeys.
647 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, ParentThrowsException) { 647 IN_PROC_BROWSER_TEST_F(WVEncryptedMediaTest, ParentThrowsException) {
648 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", kWebMAudioOnly, 648 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-a_enc-a.webm", kWebMAudioOnly,
649 "com.widevine", MSE, UNPREFIXED, kNoSessionToLoad, 649 "com.widevine", MSE, UNPREFIXED, kNoSessionToLoad,
650 false, PlayTwice::NO, kEmeNotSupportedError); 650 false, PlayTwice::NO, kEmeNotSupportedError);
651 } 651 }
652 #endif // defined(WIDEVINE_CDM_AVAILABLE) 652 #endif // defined(WIDEVINE_CDM_AVAILABLE)
653 653
654 #if defined(ENABLE_PEPPER_CDMS) 654 #if defined(ENABLE_PEPPER_CDMS)
655 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) { 655 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) {
656 TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem, kEmeKeyError); 656 TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem,
657 kEmeNotSupportedError);
657 } 658 }
658 659
659 // When CDM crashes, we should still get a decode error. 660 // When CDM crashes, we should still get a decode error.
660 // crbug.com/386657 661 // crbug.com/386657
661 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMCrashDuringDecode) { 662 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMCrashDuringDecode) {
662 IgnorePluginCrash(); 663 IgnorePluginCrash();
663 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError); 664 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError);
664 } 665 }
665 666
666 // Testing that the media browser test does fail on plugin crash. 667 // Testing that the media browser test does fail on plugin crash.
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 716
716 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) { 717 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) {
717 TestPlaybackCase(kLoadableSession, kEnded); 718 TestPlaybackCase(kLoadableSession, kEnded);
718 } 719 }
719 720
720 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) { 721 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) {
721 // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound. 722 // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound.
722 TestPlaybackCase(kUnknownSession, kEmeKeyError); 723 TestPlaybackCase(kUnknownSession, kEmeKeyError);
723 } 724 }
724 #endif // defined(ENABLE_PEPPER_CDMS) 725 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | content/content_renderer.gypi » ('j') | content/renderer/media/crypto/ppapi_decryptor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698