Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / feedback_private / feedback_private_apitest.cc

diff --git a/src/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc b/src/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc
index c6ab4c7..ba5b01d 100644 (file)
--- a/src/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc
+++ b/src/chrome/browser/extensions/api/feedback_private/feedback_private_apitest.cc
@@ -14,8 +14,14 @@ class FeedbackApiTest: public ExtensionApiTest {
   virtual ~FeedbackApiTest() {}
 };
 
-// Falis on buildbots. crbug.com/297414
-IN_PROC_BROWSER_TEST_F(FeedbackApiTest, DISABLED_Basic) {
+// Fails on Linux/Win.  http://crbug.com/408917
+#if defined(OS_WIN) || defined(OS_LINUX)
+#define MAYBE_Basic DISABLED_Basic
+#else
+#define MAYBE_Basic Basic
+#endif
+
+IN_PROC_BROWSER_TEST_F(FeedbackApiTest, MAYBE_Basic) {
   EXPECT_TRUE(RunExtensionTest("feedback_private/basic")) << message_;
 }