| Index: chrome/test/ppapi/ppapi_browsertest.cc
|
| diff --git a/chrome/test/ppapi/ppapi_browsertest.cc b/chrome/test/ppapi/ppapi_browsertest.cc
|
| index 7c2b969f1a719649236c774e560d922081664c47..367ecb0a3e8ac0ad436a371ec322ef0b5f6f53ee 100644
|
| --- a/chrome/test/ppapi/ppapi_browsertest.cc
|
| +++ b/chrome/test/ppapi/ppapi_browsertest.cc
|
| @@ -32,6 +32,10 @@
|
| #include "extensions/test/extension_test_message_listener.h"
|
| #include "ppapi/shared_impl/test_utils.h"
|
|
|
| +#if defined(OS_MACOSX)
|
| +#include "base/mac/mac_util.h"
|
| +#endif
|
| +
|
| using content::RenderViewHost;
|
|
|
| // This macro finesses macro expansion to do what we want.
|
| @@ -1305,6 +1309,10 @@ IN_PROC_BROWSER_TEST_F(NewlibPackagedAppTest,
|
| #define MAYBE_SuccessfulLoad MAYBE_PNACL_NONSFI(SuccessfulLoad)
|
| #endif
|
| IN_PROC_BROWSER_TEST_F(NonSfiPackagedAppTest, MAYBE_SuccessfulLoad) {
|
| +#if defined(OS_MACOSX)
|
| + if (base::mac::IsOS10_10() || base::mac::IsOS10_11())
|
| + return; // Fails when swarmed. http://crbug.com/660582
|
| +#endif
|
| RunTests("packaged_app");
|
| }
|
|
|
|
|