| Index: extensions/browser/api/app_window/app_window_apitest.cc
|
| diff --git a/extensions/browser/api/app_window/app_window_apitest.cc b/extensions/browser/api/app_window/app_window_apitest.cc
|
| index 857c40343291343e490595903544b8ea9b300cfe..2bc34b1b9c923fa81b7bf462948b6d00c7088a2b 100644
|
| --- a/extensions/browser/api/app_window/app_window_apitest.cc
|
| +++ b/extensions/browser/api/app_window/app_window_apitest.cc
|
| @@ -24,6 +24,10 @@
|
| #include "ui/base/win/shell.h"
|
| #endif
|
|
|
| +#if defined(OS_MACOSX)
|
| +#include "base/mac/mac_util.h"
|
| +#endif
|
| +
|
| namespace extensions {
|
|
|
| namespace {
|
| @@ -87,6 +91,10 @@ IN_PROC_BROWSER_TEST_F(ExperimentalPlatformAppBrowserTest, WindowsApiSetIcon) {
|
| #if defined(TOOLKIT_VIEWS) && !(defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA))
|
|
|
| IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, WindowsApiProperties) {
|
| +#if defined(OS_MACOSX)
|
| + if (base::mac::IsOS10_10())
|
| + return; // Fails when swarmed. http://crbug.com/660582
|
| +#endif
|
| EXPECT_TRUE(
|
| RunExtensionTest("platform_apps/windows_api_properties")) << message_;
|
| }
|
|
|