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 // TODO(fgalligan): Enable after WebM parser has been updated. | 101 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback) { |
102 // http://crbug.com/155641 | |
103 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) { | |
104 const string16 kExpected = ASCIIToUTF16("ENDED"); | 102 const string16 kExpected = ASCIIToUTF16("ENDED"); |
105 ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected)); | 103 ASSERT_NO_FATAL_FAILURE(PlayMedia(GetParam(), kExpected)); |
106 } | 104 } |
107 #endif | 105 #endif |
108 | 106 |
109 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { | 107 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) { |
110 const string16 kExpected = ASCIIToUTF16( | 108 const string16 kExpected = ASCIIToUTF16( |
111 StringToUpperASCII(std::string("GenerateKeyRequestException"))); | 109 StringToUpperASCII(std::string("GenerateKeyRequestException"))); |
112 ASSERT_NO_FATAL_FAILURE(PlayMedia("com.example.invalid", kExpected)); | 110 ASSERT_NO_FATAL_FAILURE(PlayMedia("com.example.invalid", kExpected)); |
113 } | 111 } |
114 | 112 |
115 // TODO(fgalligan): Enable after WebM parser has been updated. | 113 INSTANTIATE_TEST_CASE_P(ClearKey, EncryptedMediaTest, |
116 // http://crbug.com/155641 | |
117 INSTANTIATE_TEST_CASE_P(DISABLED_ClearKey, EncryptedMediaTest, | |
118 ::testing::Values(kClearKeyKeySystem)); | 114 ::testing::Values(kClearKeyKeySystem)); |
119 | 115 |
120 // http://crbug.com/152864 | 116 // http://crbug.com/152864 |
121 #if !defined(OS_MACOSX) | 117 #if !defined(OS_MACOSX) |
122 // TODO(fgalligan): Enable after WebM parser has been updated. | 118 INSTANTIATE_TEST_CASE_P(ExternalClearKey, EncryptedMediaTest, |
123 // http://crbug.com/155641 | |
124 INSTANTIATE_TEST_CASE_P(DISABLED_ExternalClearKey, EncryptedMediaTest, | |
125 ::testing::Values(kExternalClearKeyKeySystem)); | 119 ::testing::Values(kExternalClearKeyKeySystem)); |
126 #endif | 120 #endif |
OLD | NEW |