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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( | 195 browser()->profile()->GetHostContentSettingsMap()->SetDefaultContentSetting( |
196 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, CONTENT_SETTING_ALLOW); | 196 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, CONTENT_SETTING_ALLOW); |
197 | 197 |
198 // We shouldn't see an infobar. | 198 // We shouldn't see an infobar. |
199 InfoBarObserver observer; | 199 InfoBarObserver observer; |
200 | 200 |
201 RunTest("Broker_ConnectPermissionGranted"); | 201 RunTest("Broker_ConnectPermissionGranted"); |
202 RunTest("Broker_IsAllowedPermissionGranted"); | 202 RunTest("Broker_IsAllowedPermissionGranted"); |
203 } | 203 } |
204 | 204 |
| 205 TEST_PPAPI_IN_PROCESS(Console) |
| 206 TEST_PPAPI_OUT_OF_PROCESS(Console) |
| 207 TEST_PPAPI_NACL_VIA_HTTP(Console) |
| 208 |
205 TEST_PPAPI_IN_PROCESS(Core) | 209 TEST_PPAPI_IN_PROCESS(Core) |
206 TEST_PPAPI_OUT_OF_PROCESS(Core) | 210 TEST_PPAPI_OUT_OF_PROCESS(Core) |
207 TEST_PPAPI_NACL_VIA_HTTP(Core) | 211 TEST_PPAPI_NACL_VIA_HTTP(Core) |
208 | 212 |
209 #if defined(OS_CHROMEOS) | 213 #if defined(OS_CHROMEOS) |
210 #define MAYBE_InputEvent InputEvent | 214 #define MAYBE_InputEvent InputEvent |
211 #elif defined(OS_LINUX) | 215 #elif defined(OS_LINUX) |
212 // Times out on Linux. http://crbug.com/108859 | 216 // Times out on Linux. http://crbug.com/108859 |
213 #define MAYBE_InputEvent DISABLED_InputEvent | 217 #define MAYBE_InputEvent DISABLED_InputEvent |
214 #elif defined(OS_MACOSX) | 218 #elif defined(OS_MACOSX) |
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
912 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen | 916 #define MAYBE_FlashFullscreen DISABLED_FlashFullscreen |
913 #else | 917 #else |
914 #define MAYBE_FlashFullscreen FlashFullscreen | 918 #define MAYBE_FlashFullscreen FlashFullscreen |
915 #endif | 919 #endif |
916 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) | 920 TEST_PPAPI_OUT_OF_PROCESS(MAYBE_FlashFullscreen) |
917 | 921 |
918 TEST_PPAPI_IN_PROCESS(TalkPrivate) | 922 TEST_PPAPI_IN_PROCESS(TalkPrivate) |
919 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) | 923 TEST_PPAPI_OUT_OF_PROCESS(TalkPrivate) |
920 | 924 |
921 #endif // ADDRESS_SANITIZER | 925 #endif // ADDRESS_SANITIZER |
OLD | NEW |