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

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

Issue 2409423002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Fix and format Created 4 years, 2 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
(...skipping 10 matching lines...) Expand all
21 #include "chrome/common/chrome_switches.h" 21 #include "chrome/common/chrome_switches.h"
22 #include "chrome/test/base/in_process_browser_test.h" 22 #include "chrome/test/base/in_process_browser_test.h"
23 #include "chrome/test/base/test_launcher_utils.h" 23 #include "chrome/test/base/test_launcher_utils.h"
24 #include "chrome/test/base/ui_test_utils.h" 24 #include "chrome/test/base/ui_test_utils.h"
25 #include "content/public/common/content_switches.h" 25 #include "content/public/common/content_switches.h"
26 #include "content/public/test/browser_test_utils.h" 26 #include "content/public/test/browser_test_utils.h"
27 #include "media/base/media_switches.h" 27 #include "media/base/media_switches.h"
28 #include "media/base/test_data_util.h" 28 #include "media/base/test_data_util.h"
29 #include "media/media_features.h" 29 #include "media/media_features.h"
30 #include "net/test/embedded_test_server/embedded_test_server.h" 30 #include "net/test/embedded_test_server/embedded_test_server.h"
31 #include "ppapi/features/features.h"
31 #include "url/gurl.h" 32 #include "url/gurl.h"
32 33
33 #if defined(ENABLE_PEPPER_CDMS) 34 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
34 #include "chrome/browser/media/pepper_cdm_test_constants.h" 35 #include "chrome/browser/media/pepper_cdm_test_constants.h"
35 #include "chrome/browser/media/pepper_cdm_test_helper.h" 36 #include "chrome/browser/media/pepper_cdm_test_helper.h"
36 #endif 37 #endif
37 38
38 #if defined(OS_ANDROID) 39 #if defined(OS_ANDROID)
39 #error This file needs to be updated to run on Android. 40 #error This file needs to be updated to run on Android.
40 #endif 41 #endif
41 42
42 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 43 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
43 44
(...skipping 27 matching lines...) Expand all
71 #define EXPECT_UNKNOWN_KEYSYSTEM(test) EXPECT_EQ(kUnsupportedResult, test) 72 #define EXPECT_UNKNOWN_KEYSYSTEM(test) EXPECT_EQ(kUnsupportedResult, test)
72 #define EXPECT_NO_MATCH(test) EXPECT_EQ(kNoMatchResult, test) 73 #define EXPECT_NO_MATCH(test) EXPECT_EQ(kNoMatchResult, test)
73 74
74 #if defined(USE_PROPRIETARY_CODECS) 75 #if defined(USE_PROPRIETARY_CODECS)
75 #define EXPECT_PROPRIETARY EXPECT_SUCCESS 76 #define EXPECT_PROPRIETARY EXPECT_SUCCESS
76 #else 77 #else
77 #define EXPECT_PROPRIETARY EXPECT_NO_MATCH 78 #define EXPECT_PROPRIETARY EXPECT_NO_MATCH
78 #endif 79 #endif
79 80
80 // Expectations for External Clear Key. 81 // Expectations for External Clear Key.
81 #if defined(ENABLE_PEPPER_CDMS) 82 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
82 #define EXPECT_ECK EXPECT_SUCCESS 83 #define EXPECT_ECK EXPECT_SUCCESS
83 #define EXPECT_ECK_PROPRIETARY EXPECT_PROPRIETARY 84 #define EXPECT_ECK_PROPRIETARY EXPECT_PROPRIETARY
84 #define EXPECT_ECK_NO_MATCH EXPECT_NO_MATCH 85 #define EXPECT_ECK_NO_MATCH EXPECT_NO_MATCH
85 #else 86 #else
86 #define EXPECT_ECK EXPECT_UNKNOWN_KEYSYSTEM 87 #define EXPECT_ECK EXPECT_UNKNOWN_KEYSYSTEM
87 #define EXPECT_ECK_PROPRIETARY EXPECT_UNKNOWN_KEYSYSTEM 88 #define EXPECT_ECK_PROPRIETARY EXPECT_UNKNOWN_KEYSYSTEM
88 #define EXPECT_ECK_NO_MATCH EXPECT_UNKNOWN_KEYSYSTEM 89 #define EXPECT_ECK_NO_MATCH EXPECT_UNKNOWN_KEYSYSTEM
89 #endif // defined(ENABLE_PEPPER_CDMS) 90 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
90 91
91 // Expectations for Widevine. 92 // Expectations for Widevine.
92 #if defined(WIDEVINE_CDM_AVAILABLE) 93 #if defined(WIDEVINE_CDM_AVAILABLE)
93 #define EXPECT_WV_SUCCESS EXPECT_SUCCESS 94 #define EXPECT_WV_SUCCESS EXPECT_SUCCESS
94 #define EXPECT_WV_PROPRIETARY EXPECT_PROPRIETARY 95 #define EXPECT_WV_PROPRIETARY EXPECT_PROPRIETARY
95 #define EXPECT_WV_NO_MATCH EXPECT_NO_MATCH 96 #define EXPECT_WV_NO_MATCH EXPECT_NO_MATCH
96 #else // defined(WIDEVINE_CDM_AVAILABLE) 97 #else // defined(WIDEVINE_CDM_AVAILABLE)
97 #define EXPECT_WV_SUCCESS EXPECT_UNKNOWN_KEYSYSTEM 98 #define EXPECT_WV_SUCCESS EXPECT_UNKNOWN_KEYSYSTEM
98 #define EXPECT_WV_PROPRIETARY EXPECT_UNKNOWN_KEYSYSTEM 99 #define EXPECT_WV_PROPRIETARY EXPECT_UNKNOWN_KEYSYSTEM
99 #define EXPECT_WV_NO_MATCH EXPECT_UNKNOWN_KEYSYSTEM 100 #define EXPECT_WV_NO_MATCH EXPECT_UNKNOWN_KEYSYSTEM
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 const CodecVector& no_codecs() const { return no_codecs_; } 161 const CodecVector& no_codecs() const { return no_codecs_; }
161 const CodecVector& audio_webm_codecs() const { return audio_webm_codecs_; } 162 const CodecVector& audio_webm_codecs() const { return audio_webm_codecs_; }
162 const CodecVector& video_webm_codecs() const { return video_webm_codecs_; } 163 const CodecVector& video_webm_codecs() const { return video_webm_codecs_; }
163 const CodecVector& audio_mp4_codecs() const { return audio_mp4_codecs_; } 164 const CodecVector& audio_mp4_codecs() const { return audio_mp4_codecs_; }
164 const CodecVector& video_mp4_codecs() const { return video_mp4_codecs_; } 165 const CodecVector& video_mp4_codecs() const { return video_mp4_codecs_; }
165 const CodecVector& video_mp4_hi10p_codecs() const { 166 const CodecVector& video_mp4_hi10p_codecs() const {
166 return video_mp4_hi10p_codecs_; 167 return video_mp4_hi10p_codecs_;
167 } 168 }
168 const CodecVector& invalid_codecs() const { return invalid_codecs_; } 169 const CodecVector& invalid_codecs() const { return invalid_codecs_; }
169 170
170 #if defined(ENABLE_PEPPER_CDMS) 171 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
171 void SetUpDefaultCommandLine(base::CommandLine* command_line) override { 172 void SetUpDefaultCommandLine(base::CommandLine* command_line) override {
172 base::CommandLine default_command_line(base::CommandLine::NO_PROGRAM); 173 base::CommandLine default_command_line(base::CommandLine::NO_PROGRAM);
173 InProcessBrowserTest::SetUpDefaultCommandLine(&default_command_line); 174 InProcessBrowserTest::SetUpDefaultCommandLine(&default_command_line);
174 test_launcher_utils::RemoveCommandLineSwitch( 175 test_launcher_utils::RemoveCommandLineSwitch(
175 default_command_line, switches::kDisableComponentUpdate, command_line); 176 default_command_line, switches::kDisableComponentUpdate, command_line);
176 } 177 }
177 #endif // defined(ENABLE_PEPPER_CDMS) 178 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
178 179
179 void SetUpOnMainThread() override { 180 void SetUpOnMainThread() override {
180 InProcessBrowserTest::SetUpOnMainThread(); 181 InProcessBrowserTest::SetUpOnMainThread();
181 182
182 // Load the test page needed so that checkKeySystemWithMediaMimeType() 183 // Load the test page needed so that checkKeySystemWithMediaMimeType()
183 // is available. 184 // is available.
184 std::unique_ptr<net::EmbeddedTestServer> http_test_server( 185 std::unique_ptr<net::EmbeddedTestServer> http_test_server(
185 new net::EmbeddedTestServer); 186 new net::EmbeddedTestServer);
186 http_test_server->ServeFilesFromSourceDirectory(media::GetTestDataPath()); 187 http_test_server->ServeFilesFromSourceDirectory(media::GetTestDataPath());
187 CHECK(http_test_server->Start()); 188 CHECK(http_test_server->Start());
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 }; 273 };
273 274
274 // For ClearKey, nothing additional is required. 275 // For ClearKey, nothing additional is required.
275 class EncryptedMediaSupportedTypesClearKeyTest 276 class EncryptedMediaSupportedTypesClearKeyTest
276 : public EncryptedMediaSupportedTypesTest { 277 : public EncryptedMediaSupportedTypesTest {
277 }; 278 };
278 279
279 // For ExternalClearKey tests, ensure that the ClearKey adapter is loaded. 280 // For ExternalClearKey tests, ensure that the ClearKey adapter is loaded.
280 class EncryptedMediaSupportedTypesExternalClearKeyTest 281 class EncryptedMediaSupportedTypesExternalClearKeyTest
281 : public EncryptedMediaSupportedTypesTest { 282 : public EncryptedMediaSupportedTypesTest {
282 #if defined(ENABLE_PEPPER_CDMS) 283 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
283 protected: 284 protected:
284 void SetUpCommandLine(base::CommandLine* command_line) override { 285 void SetUpCommandLine(base::CommandLine* command_line) override {
285 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line); 286 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
286 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory, 287 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
287 kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName, 288 kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
288 kClearKeyCdmPepperMimeType); 289 kClearKeyCdmPepperMimeType);
289 command_line->AppendSwitchASCII(switches::kEnableFeatures, 290 command_line->AppendSwitchASCII(switches::kEnableFeatures,
290 media::kExternalClearKeyForTesting.name); 291 media::kExternalClearKeyForTesting.name);
291 } 292 }
292 #endif // defined(ENABLE_PEPPER_CDMS) 293 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
293 }; 294 };
294 295
295 // By default, the External Clear Key (ECK) key system is not supported even if 296 // By default, the External Clear Key (ECK) key system is not supported even if
296 // present. This test case tests this behavior by not enabling 297 // present. This test case tests this behavior by not enabling
297 // kExternalClearKeyForTesting. 298 // kExternalClearKeyForTesting.
298 // Even registering the Pepper CDM where applicable does not enable the CDM. 299 // Even registering the Pepper CDM where applicable does not enable the CDM.
299 class EncryptedMediaSupportedTypesExternalClearKeyNotEnabledTest 300 class EncryptedMediaSupportedTypesExternalClearKeyNotEnabledTest
300 : public EncryptedMediaSupportedTypesTest { 301 : public EncryptedMediaSupportedTypesTest {
301 protected: 302 protected:
302 void SetUpCommandLine(base::CommandLine* command_line) override { 303 void SetUpCommandLine(base::CommandLine* command_line) override {
303 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line); 304 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
304 #if defined(ENABLE_PEPPER_CDMS) 305 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
305 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory, 306 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
306 kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName, 307 kClearKeyCdmAdapterFileName, kClearKeyCdmDisplayName,
307 kClearKeyCdmPepperMimeType); 308 kClearKeyCdmPepperMimeType);
308 #endif // defined(ENABLE_PEPPER_CDMS) 309 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
309 } 310 }
310 }; 311 };
311 312
312 class EncryptedMediaSupportedTypesWidevineTest 313 class EncryptedMediaSupportedTypesWidevineTest
313 : public EncryptedMediaSupportedTypesTest { 314 : public EncryptedMediaSupportedTypesTest {
314 }; 315 };
315 316
316 #if defined(ENABLE_PEPPER_CDMS) 317 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
317 // Registers ClearKey CDM with the wrong path (filename). 318 // Registers ClearKey CDM with the wrong path (filename).
318 class EncryptedMediaSupportedTypesClearKeyCDMRegisteredWithWrongPathTest 319 class EncryptedMediaSupportedTypesClearKeyCDMRegisteredWithWrongPathTest
319 : public EncryptedMediaSupportedTypesTest { 320 : public EncryptedMediaSupportedTypesTest {
320 protected: 321 protected:
321 void SetUpCommandLine(base::CommandLine* command_line) override { 322 void SetUpCommandLine(base::CommandLine* command_line) override {
322 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line); 323 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
323 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory, 324 RegisterPepperCdm(command_line, kClearKeyCdmBaseDirectory,
324 "clearkeycdmadapterwrongname.dll", 325 "clearkeycdmadapterwrongname.dll",
325 kClearKeyCdmDisplayName, kClearKeyCdmPepperMimeType, 326 kClearKeyCdmDisplayName, kClearKeyCdmPepperMimeType,
326 false); 327 false);
327 command_line->AppendSwitchASCII(switches::kEnableFeatures, 328 command_line->AppendSwitchASCII(switches::kEnableFeatures,
328 media::kExternalClearKeyForTesting.name); 329 media::kExternalClearKeyForTesting.name);
329 } 330 }
330 }; 331 };
331 332
332 // Registers Widevine CDM with the wrong path (filename). 333 // Registers Widevine CDM with the wrong path (filename).
333 class EncryptedMediaSupportedTypesWidevineCDMRegisteredWithWrongPathTest 334 class EncryptedMediaSupportedTypesWidevineCDMRegisteredWithWrongPathTest
334 : public EncryptedMediaSupportedTypesTest { 335 : public EncryptedMediaSupportedTypesTest {
335 protected: 336 protected:
336 void SetUpCommandLine(base::CommandLine* command_line) override { 337 void SetUpCommandLine(base::CommandLine* command_line) override {
337 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line); 338 EncryptedMediaSupportedTypesTest::SetUpCommandLine(command_line);
338 RegisterPepperCdm(command_line, "WidevineCdm", 339 RegisterPepperCdm(command_line, "WidevineCdm",
339 "widevinecdmadapterwrongname.dll", 340 "widevinecdmadapterwrongname.dll",
340 "Widevine Content Decryption Module", 341 "Widevine Content Decryption Module",
341 "application/x-ppapi-widevine-cdm", false); 342 "application/x-ppapi-widevine-cdm", false);
342 } 343 }
343 }; 344 };
344 345
345 #endif // defined(ENABLE_PEPPER_CDMS) 346 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
346 347
347 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesClearKeyTest, Basic) { 348 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesClearKeyTest, Basic) {
348 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem( 349 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(
349 kVideoWebMMimeType, no_codecs(), kClearKey)); 350 kVideoWebMMimeType, no_codecs(), kClearKey));
350 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem( 351 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(
351 kAudioWebMMimeType, no_codecs(), kClearKey)); 352 kAudioWebMMimeType, no_codecs(), kClearKey));
352 EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem( 353 EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem(
353 kVideoMP4MimeType, no_codecs(), kClearKey)); 354 kVideoMP4MimeType, no_codecs(), kClearKey));
354 EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem( 355 EXPECT_PROPRIETARY(AreCodecsSupportedByKeySystem(
355 kAudioMP4MimeType, no_codecs(), kClearKey)); 356 kAudioMP4MimeType, no_codecs(), kClearKey));
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 EXPECT_NO_MATCH(AreCodecsSupportedByKeySystem( 468 EXPECT_NO_MATCH(AreCodecsSupportedByKeySystem(
468 kAudioMP4MimeType, audio_webm_codecs(), kClearKey)); 469 kAudioMP4MimeType, audio_webm_codecs(), kClearKey));
469 EXPECT_NO_MATCH(AreCodecsSupportedByKeySystem( 470 EXPECT_NO_MATCH(AreCodecsSupportedByKeySystem(
470 kAudioMP4MimeType, video_webm_codecs(), kClearKey)); 471 kAudioMP4MimeType, video_webm_codecs(), kClearKey));
471 } 472 }
472 473
473 // 474 //
474 // External Clear Key 475 // External Clear Key
475 // 476 //
476 477
477 // When defined(ENABLE_PEPPER_CDMS), this also tests the Pepper CDM check. 478 // When BUILDFLAG(ENABLE_PEPPER_CDMS), this also tests the Pepper CDM check.
478 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesExternalClearKeyTest, 479 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesExternalClearKeyTest,
479 Basic) { 480 Basic) {
480 EXPECT_ECK(AreCodecsSupportedByKeySystem( 481 EXPECT_ECK(AreCodecsSupportedByKeySystem(
481 kVideoWebMMimeType, no_codecs(), kExternalClearKey)); 482 kVideoWebMMimeType, no_codecs(), kExternalClearKey));
482 EXPECT_ECK(AreCodecsSupportedByKeySystem( 483 EXPECT_ECK(AreCodecsSupportedByKeySystem(
483 kAudioWebMMimeType, no_codecs(), kExternalClearKey)); 484 kAudioWebMMimeType, no_codecs(), kExternalClearKey));
484 EXPECT_ECK_PROPRIETARY(AreCodecsSupportedByKeySystem( 485 EXPECT_ECK_PROPRIETARY(AreCodecsSupportedByKeySystem(
485 kVideoMP4MimeType, no_codecs(), kExternalClearKey)); 486 kVideoMP4MimeType, no_codecs(), kExternalClearKey));
486 EXPECT_ECK_PROPRIETARY(AreCodecsSupportedByKeySystem( 487 EXPECT_ECK_PROPRIETARY(AreCodecsSupportedByKeySystem(
487 kAudioMP4MimeType, no_codecs(), kExternalClearKey)); 488 kAudioMP4MimeType, no_codecs(), kExternalClearKey));
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
692 693
693 // Invalid or Non-MP4 codec. 694 // Invalid or Non-MP4 codec.
694 EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem( 695 EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
695 kAudioMP4MimeType, invalid_codecs(), kWidevine)); 696 kAudioMP4MimeType, invalid_codecs(), kWidevine));
696 EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem( 697 EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
697 kAudioMP4MimeType, audio_webm_codecs(), kWidevine)); 698 kAudioMP4MimeType, audio_webm_codecs(), kWidevine));
698 EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem( 699 EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
699 kAudioMP4MimeType, video_webm_codecs(), kWidevine)); 700 kAudioMP4MimeType, video_webm_codecs(), kWidevine));
700 } 701 }
701 702
702 #if defined(ENABLE_PEPPER_CDMS) 703 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
703 // Since this test fixture does not register the CDMs on the command line, the 704 // Since this test fixture does not register the CDMs on the command line, the
704 // check for the CDMs in chrome_key_systems.cc should fail, and they should not 705 // check for the CDMs in chrome_key_systems.cc should fail, and they should not
705 // be registered with KeySystems. 706 // be registered with KeySystems.
706 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesTest, 707 IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesTest,
707 PepperCDMsNotRegistered) { 708 PepperCDMsNotRegistered) {
708 EXPECT_UNKNOWN_KEYSYSTEM(AreCodecsSupportedByKeySystem( 709 EXPECT_UNKNOWN_KEYSYSTEM(AreCodecsSupportedByKeySystem(
709 kVideoWebMMimeType, no_codecs(), kExternalClearKey)); 710 kVideoWebMMimeType, no_codecs(), kExternalClearKey));
710 711
711 // This will fail in all builds unless widevine is available. 712 // This will fail in all builds unless widevine is available.
712 #if !defined(WIDEVINE_CDM_AVAILABLE) 713 #if !defined(WIDEVINE_CDM_AVAILABLE)
(...skipping 26 matching lines...) Expand all
739 EncryptedMediaSupportedTypesWidevineCDMRegisteredWithWrongPathTest, 740 EncryptedMediaSupportedTypesWidevineCDMRegisteredWithWrongPathTest,
740 PepperCDMsRegisteredButAdapterNotPresent) { 741 PepperCDMsRegisteredButAdapterNotPresent) {
741 EXPECT_UNKNOWN_KEYSYSTEM(AreCodecsSupportedByKeySystem( 742 EXPECT_UNKNOWN_KEYSYSTEM(AreCodecsSupportedByKeySystem(
742 kVideoWebMMimeType, no_codecs(), kWidevine)); 743 kVideoWebMMimeType, no_codecs(), kWidevine));
743 744
744 // Clear Key should still be registered. 745 // Clear Key should still be registered.
745 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem( 746 EXPECT_SUCCESS(AreCodecsSupportedByKeySystem(
746 kVideoWebMMimeType, no_codecs(), kClearKey)); 747 kVideoWebMMimeType, no_codecs(), kClearKey));
747 } 748 }
748 #endif // !defined(WIDEVINE_CDM_AVAILABLE) 749 #endif // !defined(WIDEVINE_CDM_AVAILABLE)
749 #endif // defined(ENABLE_PEPPER_CDMS) 750 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
751
750 } // namespace chrome 752 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/browser/plugins/plugin_info_message_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698