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

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

Issue 2349813002: EME: Update MediaKeySystemConfiguration defaults; require non-empty capabilities (Closed)
Patch Set: Created 4 years, 3 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // Supported media types. 54 // Supported media types.
55 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\""; 55 const char kWebMVorbisAudioOnly[] = "audio/webm; codecs=\"vorbis\"";
56 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\""; 56 const char kWebMOpusAudioOnly[] = "audio/webm; codecs=\"opus\"";
57 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\""; 57 const char kWebMVP8VideoOnly[] = "video/webm; codecs=\"vp8\"";
58 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\""; 58 const char kWebMVorbisAudioVP8Video[] = "video/webm; codecs=\"vorbis, vp8\"";
59 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\""; 59 const char kWebMOpusAudioVP9Video[] = "video/webm; codecs=\"opus, vp9\"";
60 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\""; 60 const char kWebMVP9VideoOnly[] = "video/webm; codecs=\"vp9\"";
61 #if defined(USE_PROPRIETARY_CODECS) 61 #if defined(USE_PROPRIETARY_CODECS)
62 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\""; 62 const char kMP4AudioOnly[] = "audio/mp4; codecs=\"mp4a.40.2\"";
63 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D4041\""; 63 const char kMP4VideoOnly[] = "video/mp4; codecs=\"avc1.4D000C\"";
64 #endif // defined(USE_PROPRIETARY_CODECS) 64 #endif // defined(USE_PROPRIETARY_CODECS)
65 65
66 // Sessions to load. 66 // Sessions to load.
67 const char kNoSessionToLoad[] = ""; 67 const char kNoSessionToLoad[] = "";
68 const char kLoadableSession[] = "LoadableSession"; 68 const char kLoadableSession[] = "LoadableSession";
69 const char kUnknownSession[] = "UnknownSession"; 69 const char kUnknownSession[] = "UnknownSession";
70 70
71 // EME-specific test results and errors. 71 // EME-specific test results and errors.
72 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS"; 72 const char kUnitTestSuccess[] = "UNIT_TEST_SUCCESS";
73 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR"; 73 const char kEmeNotSupportedError[] = "NOTSUPPORTEDERROR";
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
657 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { 657 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
658 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded); 658 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded);
659 } 659 }
660 660
661 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { 661 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
662 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession, 662 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession,
663 kEmeSessionNotFound); 663 kEmeSessionNotFound);
664 } 664 }
665 665
666 #endif // defined(ENABLE_PEPPER_CDMS) 666 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | media/blink/key_system_config_selector.cc » ('j') | media/blink/key_system_config_selector.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698