Index: content/browser/device_orientation/provider_unittest.cc |
diff --git a/content/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc |
index 57fbbfe0cdb095ee5b254b71b5512b05428ca281..a180c05930311bf307411faaaad9c13817afdb86 100644 |
--- a/content/browser/device_orientation/provider_unittest.cc |
+++ b/content/browser/device_orientation/provider_unittest.cc |
@@ -248,7 +248,12 @@ TEST_F(DeviceOrientationProviderTest, MultipleObserversPushTest) { |
provider_->RemoveObserver(checker_c.get()); |
} |
-// Flaky. See crbug.com/104950. |
+#if defined(OS_LINUX) |
+// Flakily DCHECKs on Linux. See crbug.com/104950. |
+#define MAYBE_ObserverNotRemoved DISABLED_ObserverNotRemoved |
+#else |
+#define MAYBE_ObserverNotRemoved ObserverNotRemoved |
+#endif |
TEST_F(DeviceOrientationProviderTest, FLAKY_ObserverNotRemoved) { |
yosin_UTC9
2011/11/23 07:21:17
s/FLAKY_/MAYBE_/
|
scoped_refptr<MockOrientationFactory> orientation_factory( |
new MockOrientationFactory()); |