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

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

Issue 265993002: Add Promises for EME (Chromium side) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: One more trybot issue Created 6 years, 6 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 | « DEPS ('k') | content/browser/media/android/browser_media_player_manager.h » ('j') | 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 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
615 false, 615 false,
616 kEmeNotSupportedError); 616 kEmeNotSupportedError);
617 } 617 }
618 #endif // defined(WIDEVINE_CDM_AVAILABLE) 618 #endif // defined(WIDEVINE_CDM_AVAILABLE)
619 619
620 #if defined(ENABLE_PEPPER_CDMS) 620 #if defined(ENABLE_PEPPER_CDMS)
621 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) { 621 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, InitializeCDMFail) {
622 TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem, kEmeKeyError); 622 TestNonPlaybackCases(kExternalClearKeyInitializeFailKeySystem, kEmeKeyError);
623 } 623 }
624 624
625 // TODO(jrummell): Fix these tests to handle rejected promises when the CDM
626 // crashes. Currently the JavaScript doesn't expect to get any more events
627 // after a crash.
628
625 // When CDM crashes, we should still get a decode error. 629 // When CDM crashes, we should still get a decode error.
626 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMCrashDuringDecode) { 630 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMCrashDuringDecode) {
627 IgnorePluginCrash(); 631 IgnorePluginCrash();
628 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError); 632 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError);
629 } 633 }
630 634
631 // Testing that the media browser test does fail on plugin crash. 635 // Testing that the media browser test does fail on plugin crash.
632 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, CDMExpectedCrash) { 636 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, DISABLED_CDMExpectedCrash) {
633 // Plugin crash is not ignored by default, the test is expected to fail. 637 // Plugin crash is not ignored by default, the test is expected to fail.
634 EXPECT_NONFATAL_FAILURE( 638 EXPECT_NONFATAL_FAILURE(
635 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError), 639 TestNonPlaybackCases(kExternalClearKeyCrashKeySystem, kError),
636 "plugin crash"); 640 "plugin crash");
637 } 641 }
638 642
639 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) { 643 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, FileIOTest) {
640 TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem, 644 TestNonPlaybackCases(kExternalClearKeyFileIOTestKeySystem,
641 kFileIOTestSuccess); 645 kFileIOTestSuccess);
642 } 646 }
(...skipping 16 matching lines...) Expand all
659 "bear-320x240-v-enc_v.webm", 663 "bear-320x240-v-enc_v.webm",
660 kWebMVideoOnly, 664 kWebMVideoOnly,
661 kExternalClearKeyKeySystem, 665 kExternalClearKeyKeySystem,
662 SRC, 666 SRC,
663 PREFIXED, 667 PREFIXED,
664 kUnknownSession, 668 kUnknownSession,
665 false, 669 false,
666 kEmeKeyError); 670 kEmeKeyError);
667 } 671 }
668 #endif // defined(ENABLE_PEPPER_CDMS) 672 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « DEPS ('k') | content/browser/media/android/browser_media_player_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698