Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(750)

Unified Diff: chrome/browser/extensions/extension_icon_source_apitest.cc

Issue 15019008: Disable ExtensionIconSourceTest.IconLoaded* on Mac and Win (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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")));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698