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/path_service.h" | 5 #include "base/path_service.h" |
6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
9 #include "chrome/browser/extensions/extension_browsertest.h" | 9 #include "chrome/browser/extensions/extension_browsertest.h" |
10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
922 RUN_AUDIO_CONFIG_SUBTESTS; | 922 RUN_AUDIO_CONFIG_SUBTESTS; |
923 } | 923 } |
924 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(AudioConfig)) { | 924 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClTest, MAYBE_PPAPI_NACL(AudioConfig)) { |
925 RUN_AUDIO_CONFIG_SUBTESTS; | 925 RUN_AUDIO_CONFIG_SUBTESTS; |
926 } | 926 } |
927 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, | 927 IN_PROC_BROWSER_TEST_F(PPAPINaClPNaClNonSfiTest, |
928 MAYBE_PNACL_NONSFI(AudioConfig)) { | 928 MAYBE_PNACL_NONSFI(AudioConfig)) { |
929 RUN_AUDIO_CONFIG_SUBTESTS; | 929 RUN_AUDIO_CONFIG_SUBTESTS; |
930 } | 930 } |
931 | 931 |
| 932 TEST_PPAPI_NACL(AudioEncoder) |
| 933 |
932 // PPB_Audio tests. | 934 // PPB_Audio tests. |
933 #define RUN_AUDIO_SUBTESTS \ | 935 #define RUN_AUDIO_SUBTESTS \ |
934 RunTestViaHTTP( \ | 936 RunTestViaHTTP( \ |
935 LIST_TEST(Audio_Creation) \ | 937 LIST_TEST(Audio_Creation) \ |
936 LIST_TEST(Audio_DestroyNoStop) \ | 938 LIST_TEST(Audio_DestroyNoStop) \ |
937 LIST_TEST(Audio_Failures) \ | 939 LIST_TEST(Audio_Failures) \ |
938 LIST_TEST(Audio_AudioCallback1) \ | 940 LIST_TEST(Audio_AudioCallback1) \ |
939 LIST_TEST(Audio_AudioCallback2) \ | 941 LIST_TEST(Audio_AudioCallback2) \ |
940 LIST_TEST(Audio_AudioCallback3) \ | 942 LIST_TEST(Audio_AudioCallback3) \ |
941 LIST_TEST(Audio_AudioCallback4) \ | 943 LIST_TEST(Audio_AudioCallback4) \ |
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1283 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1285 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
1284 RunTests("no_socket_permissions"); | 1286 RunTests("no_socket_permissions"); |
1285 } | 1287 } |
1286 | 1288 |
1287 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1289 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1288 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1290 MAYBE_PPAPI_NACL(SocketPermissions)) { |
1289 RunTests("socket_permissions"); | 1291 RunTests("socket_permissions"); |
1290 } | 1292 } |
1291 | 1293 |
1292 #endif | 1294 #endif |
OLD | NEW |