| Index: chrome/browser/apps/app_window_browsertest.cc
|
| diff --git a/chrome/browser/apps/app_window_browsertest.cc b/chrome/browser/apps/app_window_browsertest.cc
|
| index 42f4838927309448660ef670dac9321bbba1fd11..f0596bdc468a1873a670642446e4933ebd7797a3 100644
|
| --- a/chrome/browser/apps/app_window_browsertest.cc
|
| +++ b/chrome/browser/apps/app_window_browsertest.cc
|
| @@ -17,6 +17,10 @@
|
| #include "extensions/test/extension_test_message_listener.h"
|
| #include "extensions/test/result_catcher.h"
|
|
|
| +#if defined(OS_MACOSX)
|
| +#include "base/mac/mac_util.h"
|
| +#endif
|
| +
|
| using extensions::AppWindowGeometryCache;
|
| using extensions::ResultCatcher;
|
|
|
| @@ -154,6 +158,10 @@ IN_PROC_BROWSER_TEST_F(AppWindowAPITest, DISABLED_TestMaximize) {
|
| #endif
|
|
|
| IN_PROC_BROWSER_TEST_F(AppWindowAPITest, MAYBE_TestMinimize) {
|
| +#if defined(OS_MACOSX)
|
| + if (base::mac::IsOS10_10())
|
| + return; // Fails when swarmed. http://crbug.com/660582
|
| +#endif
|
| ASSERT_TRUE(RunAppWindowAPITest("testMinimize")) << message_;
|
| }
|
|
|
|
|