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

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

Issue 8663001: Mark ExtensionApiTest.CrossOriginXHRFileAccess flaky on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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/cross_origin_xhr_apitest.cc
diff --git a/chrome/browser/extensions/cross_origin_xhr_apitest.cc b/chrome/browser/extensions/cross_origin_xhr_apitest.cc
index 7f678976e16ae4dce851dfd172c452a60584d476..790901965fc702ffffaf3e0ae9d00b04b1bda8fc 100644
--- a/chrome/browser/extensions/cross_origin_xhr_apitest.cc
+++ b/chrome/browser/extensions/cross_origin_xhr_apitest.cc
@@ -23,7 +23,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRContentScript) {
ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/content_script")) << message_;
}
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CrossOriginXHRFileAccess) {
+// Flaky on Mac 10.5, crbug.com/105179.
+#if defined(OS_MACOSX)
+#define MAYBE_CrossOriginXHRFileAccess FLAKY_CrossOriginXHRFileAccess
+#else
+#define MAYBE_CrossOriginXHRFileAccess CrossOriginXHRFileAccess
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_CrossOriginXHRFileAccess) {
ASSERT_TRUE(RunExtensionTest("cross_origin_xhr/file_access")) << message_;
}
« 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