summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 07:20:56 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 07:20:56 +0000
commit393b5d3527605f5c808a077f7bd095ce365ed151 (patch)
tree85394b18160115667a3c0f11306f541e79dcafd8
parent9fc176de525b470b3e8a698143dcb899ce0bb5c4 (diff)
downloadchromium_src-393b5d3527605f5c808a077f7bd095ce365ed151.zip
chromium_src-393b5d3527605f5c808a077f7bd095ce365ed151.tar.gz
chromium_src-393b5d3527605f5c808a077f7bd095ce365ed151.tar.bz2
Disable DeviceOrientationproviderTest.ObserverNotRemoved on Linux
BUG=104950 TBR=hans@chromium.org Review URL: http://codereview.chromium.org/8682001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111326 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/device_orientation/provider_unittest.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/content/browser/device_orientation/provider_unittest.cc b/content/browser/device_orientation/provider_unittest.cc
index 57fbbfe..a705ed6 100644
--- a/content/browser/device_orientation/provider_unittest.cc
+++ b/content/browser/device_orientation/provider_unittest.cc
@@ -248,8 +248,13 @@ TEST_F(DeviceOrientationProviderTest, MultipleObserversPushTest) {
provider_->RemoveObserver(checker_c.get());
}
-// Flaky. See crbug.com/104950.
-TEST_F(DeviceOrientationProviderTest, FLAKY_ObserverNotRemoved) {
+#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, MAYBE_ObserverNotRemoved) {
scoped_refptr<MockOrientationFactory> orientation_factory(
new MockOrientationFactory());
Init(MockOrientationFactory::CreateDataFetcher);