| 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 14 matching lines...) Expand all Loading... |
| 25 #include "components/nacl/common/nacl_switches.h" | 25 #include "components/nacl/common/nacl_switches.h" |
| 26 #include "content/public/browser/web_contents.h" | 26 #include "content/public/browser/web_contents.h" |
| 27 #include "content/public/common/content_switches.h" | 27 #include "content/public/common/content_switches.h" |
| 28 #include "content/public/common/url_constants.h" | 28 #include "content/public/common/url_constants.h" |
| 29 #include "content/public/test/javascript_test_observer.h" | 29 #include "content/public/test/javascript_test_observer.h" |
| 30 #include "content/public/test/test_renderer_host.h" | 30 #include "content/public/test/test_renderer_host.h" |
| 31 #include "extensions/common/constants.h" | 31 #include "extensions/common/constants.h" |
| 32 #include "extensions/test/extension_test_message_listener.h" | 32 #include "extensions/test/extension_test_message_listener.h" |
| 33 #include "ppapi/shared_impl/test_utils.h" | 33 #include "ppapi/shared_impl/test_utils.h" |
| 34 | 34 |
| 35 #if defined(OS_MACOSX) |
| 36 #include "base/mac/mac_util.h" |
| 37 #endif |
| 38 |
| 35 using content::RenderViewHost; | 39 using content::RenderViewHost; |
| 36 | 40 |
| 37 // This macro finesses macro expansion to do what we want. | 41 // This macro finesses macro expansion to do what we want. |
| 38 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) | 42 #define STRIP_PREFIXES(test_name) ppapi::StripTestPrefixes(#test_name) |
| 39 // Turn the given token into a string. This allows us to use precompiler stuff | 43 // Turn the given token into a string. This allows us to use precompiler stuff |
| 40 // to turn names into DISABLED_Foo, but still pass a string to RunTest. | 44 // to turn names into DISABLED_Foo, but still pass a string to RunTest. |
| 41 #define STRINGIFY(test_name) #test_name | 45 #define STRINGIFY(test_name) #test_name |
| 42 #define LIST_TEST(test_name) STRINGIFY(test_name) "," | 46 #define LIST_TEST(test_name) STRINGIFY(test_name) "," |
| 43 | 47 |
| 44 // Use these macros to run the tests for a specific interface. | 48 // Use these macros to run the tests for a specific interface. |
| (...skipping 1253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1298 RunTests("packaged_app"); | 1302 RunTests("packaged_app"); |
| 1299 } | 1303 } |
| 1300 | 1304 |
| 1301 #if defined(OS_LINUX) | 1305 #if defined(OS_LINUX) |
| 1302 // http://crbug.com/579804 | 1306 // http://crbug.com/579804 |
| 1303 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad | 1307 #define MAYBE_SuccessfulLoad DISABLED_SuccessfulLoad |
| 1304 #else | 1308 #else |
| 1305 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad) | 1309 #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad) |
| 1306 #endif | 1310 #endif |
| 1307 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) { | 1311 IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) { |
| 1312 #if defined(OS_MACOSX) |
| 1313 if (base::mac::IsOS10_10() || base::mac::IsOS10_11()) |
| 1314 return; // Fails when swarmed. http://crbug.com/660582 |
| 1315 #endif |
| 1308 RunTests("packaged_app"); | 1316 RunTests("packaged_app"); |
| 1309 } | 1317 } |
| 1310 | 1318 |
| 1311 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1319 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1312 MAYBE_PPAPI_NACL(MulticastPermissions)) { | 1320 MAYBE_PPAPI_NACL(MulticastPermissions)) { |
| 1313 RunTests("multicast_permissions"); | 1321 RunTests("multicast_permissions"); |
| 1314 } | 1322 } |
| 1315 | 1323 |
| 1316 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1324 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1317 MAYBE_PPAPI_NACL(NoSocketPermissions)) { | 1325 MAYBE_PPAPI_NACL(NoSocketPermissions)) { |
| 1318 RunTests("no_socket_permissions"); | 1326 RunTests("no_socket_permissions"); |
| 1319 } | 1327 } |
| 1320 | 1328 |
| 1321 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, | 1329 IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest, |
| 1322 MAYBE_PPAPI_NACL(SocketPermissions)) { | 1330 MAYBE_PPAPI_NACL(SocketPermissions)) { |
| 1323 RunTests("socket_permissions"); | 1331 RunTests("socket_permissions"); |
| 1324 } | 1332 } |
| 1325 | 1333 |
| 1326 #endif | 1334 #endif |
| OLD | NEW |