| Index: chrome/browser/extensions/extension_icon_source_apitest.cc
|
| diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc
|
| index 0dd5064e0ea0052efbb8b1d2350444ca459bf70a..906fe644e6d4d753109ea0a756057d0cff454f60 100644
|
| --- a/chrome/browser/extensions/extension_icon_source_apitest.cc
|
| +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc
|
| @@ -23,7 +23,14 @@ class ExtensionIconSourceTest : public ExtensionApiTest {
|
| }
|
| };
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) {
|
| +// Times out on Mac and Win. http://crbug.com/238705
|
| +#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +#define MAYBE_IconsLoaded DISABLED_IconsLoaded
|
| +#else
|
| +#define MAYBE_IconsLoaded IconsLoaded
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, MAYBE_IconsLoaded) {
|
| base::FilePath basedir = test_data_dir_.AppendASCII("icons");
|
| ASSERT_TRUE(LoadExtension(basedir.AppendASCII("extension_with_permission")));
|
| ASSERT_TRUE(LoadExtension(basedir.AppendASCII("extension_no_permission")));
|
| @@ -67,7 +74,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, InvalidURL) {
|
| EXPECT_EQ(result, "invalid (96\xC3\x97""96)");
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) {
|
| +// Times out on Mac and Win. http://crbug.com/238705
|
| +#if defined(OS_WIN) || defined(OS_MACOSX)
|
| +#define MAYBE_IconsLoadedIncognito DISABLED_IconsLoadedIncognito
|
| +#else
|
| +#define MAYBE_IconsLoadedIncognito IconsLoadedIncognito
|
| +#endif
|
| +
|
| +IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, MAYBE_IconsLoadedIncognito) {
|
| base::FilePath basedir = test_data_dir_.AppendASCII("icons");
|
| ASSERT_TRUE(LoadExtensionIncognito(
|
| basedir.AppendASCII("extension_with_permission")));
|
|
|