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 "chrome/test/ppapi/ppapi_test.h" | 5 #include "chrome/test/ppapi/ppapi_test.h" |
6 | 6 |
7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/content_settings/host_content_settings_map.h" | 9 #include "chrome/browser/content_settings/host_content_settings_map.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 1178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1189 | 1189 |
1190 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioThreadCreator) { | 1190 IN_PROC_BROWSER_TEST_F(PPAPINaClNewlibTest, AudioThreadCreator) { |
1191 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1191 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1192 } | 1192 } |
1193 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioThreadCreator)) { | 1193 IN_PROC_BROWSER_TEST_F(PPAPINaClGLibcTest, MAYBE_GLIBC(AudioThreadCreator)) { |
1194 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1194 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1195 } | 1195 } |
1196 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioThreadCreator) { | 1196 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, AudioThreadCreator) { |
1197 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1197 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1198 } | 1198 } |
1199 // TODO(hidehiko): Enable AudioThreadCreator testing for NonSfi when | 1199 // TODO(hidehiko): Enable AudioThreadCreator testing for NonSfi when |
Mark Seaborn
2014/04/23 02:28:40
You can remove the TODO now.
hidehiko
2014/04/23 13:32:59
Done.
| |
1200 // PPB_Audio_Shared::SetThreadFunctions is fixed. | 1200 // PPB_Audio_Shared::SetThreadFunctions is fixed. |
1201 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, DISABLED_AudioThreadCreator) { | 1201 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
1202 MAYBE_NONSFI(AudioThreadCreator)) { | |
1202 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; | 1203 RUN_AUDIO_THREAD_CREATOR_SUBTESTS; |
1203 } | 1204 } |
1204 | 1205 |
1205 TEST_PPAPI_IN_PROCESS(View_CreatedVisible); | 1206 TEST_PPAPI_IN_PROCESS(View_CreatedVisible); |
1206 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible); | 1207 TEST_PPAPI_OUT_OF_PROCESS(View_CreatedVisible); |
1207 TEST_PPAPI_NACL(View_CreatedVisible); | 1208 TEST_PPAPI_NACL(View_CreatedVisible); |
1208 // This test ensures that plugins created in a background tab have their | 1209 // This test ensures that plugins created in a background tab have their |
1209 // initial visibility set to false. We don't bother testing in-process for this | 1210 // initial visibility set to false. We don't bother testing in-process for this |
1210 // custom test since the out of process code also exercises in-process. | 1211 // custom test since the out of process code also exercises in-process. |
1211 | 1212 |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1385 LIST_TEST(FlashDRM_GetHmonitor) | 1386 LIST_TEST(FlashDRM_GetHmonitor) |
1386 LIST_TEST(FlashDRM_GetVoucherFile)); | 1387 LIST_TEST(FlashDRM_GetVoucherFile)); |
1387 } | 1388 } |
1388 | 1389 |
1389 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 1390 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
1390 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 1391 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
1391 | 1392 |
1392 #if defined(OS_CHROMEOS) | 1393 #if defined(OS_CHROMEOS) |
1393 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) | 1394 TEST_PPAPI_OUT_OF_PROCESS(OutputProtectionPrivate) |
1394 #endif | 1395 #endif |
OLD | NEW |