| 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 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1292 void SetUpCommandLine(base::CommandLine* command_line) override { | 1292 void SetUpCommandLine(base::CommandLine* command_line) override { |
| 1293 PackagedAppTest::SetUpCommandLine(command_line); | 1293 PackagedAppTest::SetUpCommandLine(command_line); |
| 1294 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); | 1294 command_line->AppendSwitch(switches::kEnableNaClNonSfiMode); |
| 1295 } | 1295 } |
| 1296 }; | 1296 }; |
| 1297 | 1297 |
| 1298 // Load a packaged app, and wait for it to successfully post a "hello" message | 1298 // Load a packaged app, and wait for it to successfully post a "hello" message |
| 1299 // back. | 1299 // back. |
| 1300 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1300 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1301 MAYBE_PPAPI_NACL(SuccessfulLoad)) { | 1301 MAYBE_PPAPI_NACL(SuccessfulLoad)) { |
| 1302 #if defined(OS_MACOSX) | |
| 1303 if (base::mac::IsOS10_10() || base::mac::IsOS10_11()) | |
| 1304 return; // Fails when swarmed. http://crbug.com/660582 | |
| 1305 #endif | |
| 1306 RunTests("packaged_app"); | 1302 RunTests("packaged_app"); |
| 1307 } | 1303 } |
| 1308 | 1304 |
| 1309 #if defined(OS_LINUX) | 1305 #if defined(OS_LINUX) |
| 1310 // http://crbug.com/579804 | 1306 // http://crbug.com/579804 |
| 1311 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad | 1307 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad |
| 1312 #else | 1308 #else |
| 1313 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad) | 1309 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad) |
| 1314 #endif | 1310 #endif |
| 1315 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) { | 1311 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) { |
| 1316 RunTests("packaged_app"); | 1312 RunTests("packaged_app"); |
| 1317 } | 1313 } |
| 1318 | 1314 |
| 1319 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1315 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1320 MAYBE_PPAPI_NACL(MulticastPermissions)) { | 1316 MAYBE_PPAPI_NACL(MulticastPermissions)) { |
| 1321 RunTests("multicast_permissions"); | 1317 RunTests("multicast_permissions"); |
| 1322 } | 1318 } |
| 1323 | 1319 |
| 1324 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1320 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1325 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1321 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
| 1326 RunTests("no_socket_permissions"); | 1322 RunTests("no_socket_permissions"); |
| 1327 } | 1323 } |
| 1328 | 1324 |
| 1329 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1325 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1330 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1326 MAYBE_PPAPI_NACL(SocketPermissions)) { |
| 1331 RunTests("socket_permissions"); | 1327 RunTests("socket_permissions"); |
| 1332 } | 1328 } |
| 1333 | 1329 |
| 1334 #endif | 1330 #endif |
| OLD | NEW |