| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/string16.h" | 8 #include "base/string16.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 } | 91 } |
| 92 }; | 92 }; |
| 93 | 93 |
| 94 // Fails on Linux/ChromeOS with ASan. http://crbug.com/153231 | 94 // Fails on Linux/ChromeOS with ASan. http://crbug.com/153231 |
| 95 #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ADDRESS_SANITIZER) | 95 #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ADDRESS_SANITIZER) |
| 96 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) { | 96 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) { |
| 97 const string16 kExpected = ASCIIToUTF16("ENDED"); | 97 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 98 ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected)); | 98 ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected)); |
| 99 } | 99 } |
| 100 #else | 100 #else |
| 101 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback) { | 101 // TODO(fgalligan): Enable after WebM parser has been updated. |
| 102 // http://crbug.com/155641 |
| 103 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) { |
| 102 const string16 kExpected = ASCIIToUTF16("ENDED"); | 104 const string16 kExpected = ASCIIToUTF16("ENDED"); |
| 103 ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected)); | 105 ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected)); |
| 104 } | 106 } |
| 105 #endif | 107 #endif |
| 106 | 108 |
| 107 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { | 109 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { |
| 108 const string16 kExpected = ASCIIToUTF16( | 110 const string16 kExpected = ASCIIToUTF16( |
| 109 StringToUpperASCII(std::string("GenerateKeyRequestException"))); | 111 StringToUpperASCII(std::string("GenerateKeyRequestException"))); |
| 110 ASSERT_NO_FATAL_FAILURE(PlayMedia("com.example.invalid", kExpected)); | 112 ASSERT_NO_FATAL_FAILURE(PlayMedia("com.example.invalid", kExpected)); |
| 111 } | 113 } |
| 112 | 114 |
| 113 INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest, | 115 // TODO(fgalligan): Enable after WebM parser has been updated. |
| 116 // http://crbug.com/155641 |
| 117 INSTANTIATE_TEST_CASE_P(DISABLED_ClearKey, EncryptedMediaTest, |
| 114 ::testing::Values(kClearKeyKeySystem)); | 118 ::testing::Values(kClearKeyKeySystem)); |
| 115 | 119 |
| 116 // http://crbug.com/152864 | 120 // http://crbug.com/152864 |
| 117 #if !defined(OS_MACOSX) | 121 #if !defined(OS_MACOSX) |
| 118 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest, | 122 // TODO(fgalligan): Enable after WebM parser has been updated. |
| 123 // http://crbug.com/155641 |
| 124 INSTANTIATE_TEST_CASE_P(DISABLED_ExternalClearKey, EncryptedMediaTest, |
| 119 ::testing::Values(kExternalClearKeyKeySystem)); | 125 ::testing::Values(kExternalClearKeyKeySystem)); |
| 120 #endif | 126 #endif |
| OLD | NEW |