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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/test/test_timeouts.h" | 9 #include "base/test/test_timeouts.h" |
10 #include "base/win/windows_version.h" | 10 #include "base/win/windows_version.h" |
(...skipping 1272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1283 } | 1283 } |
1284 }; | 1284 }; |
1285 | 1285 |
1286 // Load a packaged app, and wait for it to successfully post a "hello" message | 1286 // Load a packaged app, and wait for it to successfully post a "hello" message |
1287 // back. | 1287 // back. |
1288 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1288 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1289 MAYBE_PPAPI_NACL(SuccessfulLoad)) { | 1289 MAYBE_PPAPI_NACL(SuccessfulLoad)) { |
1290 RunTests("packaged_app"); | 1290 RunTests("packaged_app"); |
1291 } | 1291 } |
1292 | 1292 |
1293 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, | 1293 #if defined(OS_LINUX) |
1294 MAYBE_PNACL_NONSFI(SuccessfulLoad)) { | 1294 // http://crbug.com/579804 |
| 1295 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad |
| 1296 #else |
| 1297 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad) |
| 1298 #endif |
| 1299 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) { |
1295 RunTests("packaged_app"); | 1300 RunTests("packaged_app"); |
1296 } | 1301 } |
1297 | 1302 |
1298 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1303 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1299 MAYBE_PPAPI_NACL(MulticastPermissions)) { | 1304 MAYBE_PPAPI_NACL(MulticastPermissions)) { |
1300 RunTests("multicast_permissions"); | 1305 RunTests("multicast_permissions"); |
1301 } | 1306 } |
1302 | 1307 |
1303 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1308 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1304 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1309 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
1305 RunTests("no_socket_permissions"); | 1310 RunTests("no_socket_permissions"); |
1306 } | 1311 } |
1307 | 1312 |
1308 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1313 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
1309 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1314 MAYBE_PPAPI_NACL(SocketPermissions)) { |
1310 RunTests("socket_permissions"); | 1315 RunTests("socket_permissions"); |
1311 } | 1316 } |
1312 | 1317 |
1313 #endif | 1318 #endif |
OLD | NEW |