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

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

Issue 624173002: replace OVERRIDE and FINAL with override and final in chrome/browser/[j-q]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/base_switches.h" 8 #include "base/base_switches.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 CodecVector vp8_invalid_extension_codec_; 318 CodecVector vp8_invalid_extension_codec_;
319 bool is_test_page_loaded_; 319 bool is_test_page_loaded_;
320 bool is_pepper_cdm_registered_; 320 bool is_pepper_cdm_registered_;
321 }; 321 };
322 322
323 // For ExternalClearKey tests, ensure that the ClearKey adapter is loaded. 323 // For ExternalClearKey tests, ensure that the ClearKey adapter is loaded.
324 class EncryptedMediaIsTypeSupportedExternalClearKeyTest 324 class EncryptedMediaIsTypeSupportedExternalClearKeyTest
325 : public EncryptedMediaIsTypeSupportedTest { 325 : public EncryptedMediaIsTypeSupportedTest {
326 #if defined(ENABLE_PEPPER_CDMS) 326 #if defined(ENABLE_PEPPER_CDMS)
327 protected: 327 protected:
328 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 328 virtual void SetUpCommandLine(CommandLine* command_line) override {
329 // Platform-specific filename relative to the chrome executable. 329 // Platform-specific filename relative to the chrome executable.
330 const char adapter_file_name[] = 330 const char adapter_file_name[] =
331 #if defined(OS_MACOSX) 331 #if defined(OS_MACOSX)
332 "clearkeycdmadapter.plugin"; 332 "clearkeycdmadapter.plugin";
333 #elif defined(OS_WIN) 333 #elif defined(OS_WIN)
334 "clearkeycdmadapter.dll"; 334 "clearkeycdmadapter.dll";
335 #elif defined(OS_POSIX) 335 #elif defined(OS_POSIX)
336 "libclearkeycdmadapter.so"; 336 "libclearkeycdmadapter.so";
337 #endif 337 #endif
338 338
339 const std::string pepper_name("application/x-ppapi-clearkey-cdm"); 339 const std::string pepper_name("application/x-ppapi-clearkey-cdm");
340 RegisterPepperCdm(command_line, adapter_file_name, pepper_name); 340 RegisterPepperCdm(command_line, adapter_file_name, pepper_name);
341 } 341 }
342 #endif // defined(ENABLE_PEPPER_CDMS) 342 #endif // defined(ENABLE_PEPPER_CDMS)
343 }; 343 };
344 344
345 // For Widevine tests, ensure that the Widevine adapter is loaded. 345 // For Widevine tests, ensure that the Widevine adapter is loaded.
346 class EncryptedMediaIsTypeSupportedWidevineTest 346 class EncryptedMediaIsTypeSupportedWidevineTest
347 : public EncryptedMediaIsTypeSupportedTest { 347 : public EncryptedMediaIsTypeSupportedTest {
348 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ 348 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
349 defined(WIDEVINE_CDM_IS_COMPONENT) 349 defined(WIDEVINE_CDM_IS_COMPONENT)
350 protected: 350 protected:
351 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 351 virtual void SetUpCommandLine(CommandLine* command_line) override {
352 // File name of the adapter on different platforms. 352 // File name of the adapter on different platforms.
353 const char adapter_file_name[] = 353 const char adapter_file_name[] =
354 #if defined(OS_MACOSX) 354 #if defined(OS_MACOSX)
355 "widevinecdmadapter.plugin"; 355 "widevinecdmadapter.plugin";
356 #elif defined(OS_WIN) 356 #elif defined(OS_WIN)
357 "widevinecdmadapter.dll"; 357 "widevinecdmadapter.dll";
358 #else // OS_LINUX, etc. 358 #else // OS_LINUX, etc.
359 "libwidevinecdmadapter.so"; 359 "libwidevinecdmadapter.so";
360 #endif 360 #endif
361 361
362 const std::string pepper_name("application/x-ppapi-widevine-cdm"); 362 const std::string pepper_name("application/x-ppapi-widevine-cdm");
363 RegisterPepperCdm(command_line, adapter_file_name, pepper_name); 363 RegisterPepperCdm(command_line, adapter_file_name, pepper_name);
364 } 364 }
365 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && 365 #endif // defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) &&
366 // defined(WIDEVINE_CDM_IS_COMPONENT) 366 // defined(WIDEVINE_CDM_IS_COMPONENT)
367 }; 367 };
368 368
369 #if defined(ENABLE_PEPPER_CDMS) 369 #if defined(ENABLE_PEPPER_CDMS)
370 // Registers ClearKey CDM with the wrong path (filename). 370 // Registers ClearKey CDM with the wrong path (filename).
371 class EncryptedMediaIsTypeSupportedClearKeyCDMRegisteredWithWrongPathTest 371 class EncryptedMediaIsTypeSupportedClearKeyCDMRegisteredWithWrongPathTest
372 : public EncryptedMediaIsTypeSupportedTest { 372 : public EncryptedMediaIsTypeSupportedTest {
373 protected: 373 protected:
374 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 374 virtual void SetUpCommandLine(CommandLine* command_line) override {
375 RegisterPepperCdm(command_line, 375 RegisterPepperCdm(command_line,
376 "clearkeycdmadapterwrongname.dll", 376 "clearkeycdmadapterwrongname.dll",
377 "application/x-ppapi-clearkey-cdm", 377 "application/x-ppapi-clearkey-cdm",
378 false); 378 false);
379 } 379 }
380 }; 380 };
381 381
382 // Registers Widevine CDM with the wrong path (filename). 382 // Registers Widevine CDM with the wrong path (filename).
383 class EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest 383 class EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest
384 : public EncryptedMediaIsTypeSupportedTest { 384 : public EncryptedMediaIsTypeSupportedTest {
385 protected: 385 protected:
386 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 386 virtual void SetUpCommandLine(CommandLine* command_line) override {
387 RegisterPepperCdm(command_line, 387 RegisterPepperCdm(command_line,
388 "widevinecdmadapterwrongname.dll", 388 "widevinecdmadapterwrongname.dll",
389 "application/x-ppapi-widevine-cdm", 389 "application/x-ppapi-widevine-cdm",
390 false); 390 false);
391 } 391 }
392 }; 392 };
393 #endif // defined(ENABLE_PEPPER_CDMS) 393 #endif // defined(ENABLE_PEPPER_CDMS)
394 394
395 IN_PROC_BROWSER_TEST_F(EncryptedMediaIsTypeSupportedTest, ClearKey_Basic) { 395 IN_PROC_BROWSER_TEST_F(EncryptedMediaIsTypeSupportedTest, ClearKey_Basic) {
396 EXPECT_TRUE(IsConcreteSupportedKeySystem(kPrefixedClearKey)); 396 EXPECT_TRUE(IsConcreteSupportedKeySystem(kPrefixedClearKey));
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
1137 EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest, 1137 EncryptedMediaIsTypeSupportedWidevineCDMRegisteredWithWrongPathTest,
1138 PepperCDMsRegisteredButAdapterNotPresent) { 1138 PepperCDMsRegisteredButAdapterNotPresent) {
1139 EXPECT_FALSE(IsConcreteSupportedKeySystem(kWidevineAlpha)); 1139 EXPECT_FALSE(IsConcreteSupportedKeySystem(kWidevineAlpha));
1140 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType( 1140 EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
1141 "video/webm", no_codecs(), kWidevineAlpha)); 1141 "video/webm", no_codecs(), kWidevineAlpha));
1142 } 1142 }
1143 #endif // !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT ) 1143 #endif // !defined(WIDEVINE_CDM_AVAILABLE) || defined(WIDEVINE_CDM_IS_COMPONENT )
1144 #endif // defined(ENABLE_PEPPER_CDMS) 1144 #endif // defined(ENABLE_PEPPER_CDMS)
1145 1145
1146 } // namespace chrome 1146 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/browser/media/fake_desktop_media_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698